diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-30 20:57:39 -0700 |
| commit | ab997aaeb9cf7a0da1cecc46c5bb6c7262416917 (patch) | |
| tree | b8a09ed676101a2478d17c1d71da1274293c3c64 /kernel/resource.c | |
| parent | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (diff) | |
| parent | bd53d1270f51c6cfb53b06c8f93fd42327871d6b (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 52f696f11ad..26967e04220 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -263,7 +263,7 @@ static int find_resource(struct resource *root, struct resource *new, new->start = min; if (new->end > max) new->end = max; - new->start = (new->start + align - 1) & ~(align - 1); + new->start = ALIGN(new->start, align); if (alignf) alignf(alignf_data, new, size, align); if (new->start < new->end && new->end - new->start >= size - 1) { |