projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
587ff8c
)
x86/mm/gart: Drop unnecessary check
author
Wang YanQing
<
[email protected]
>
Tue, 16 Apr 2013 01:37:34 +0000
(09:37 +0800)
committer
Ingo Molnar
<
[email protected]
>
Tue, 16 Apr 2013 08:54:40 +0000
(10:54 +0200)
The memblock_find_in_range() return value addr is guaranteed
to be within "addr + aper_size" and not beyond GART_MAX_ADDR.
Signed-off-by: Wang YanQing <
[email protected]
>
Cc:
[email protected]
Link:
http://lkml.kernel.org/r/20130416013734.GA14641@udknight
Signed-off-by: Ingo Molnar <
[email protected]
>
arch/x86/kernel/aperture_64.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/aperture_64.c
b/arch/x86/kernel/aperture_64.c
index d5fd66f0d4cd01ea1420180af7a1ac0be2313045..fd972a3e4cbb0919221f6f69299a857972ef44e6 100644
(file)
--- a/
arch/x86/kernel/aperture_64.c
+++ b/
arch/x86/kernel/aperture_64.c
@@
-87,7
+87,7
@@
static u32 __init allocate_aperture(void)
*/
addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
aper_size, aper_size);
- if (!addr
|| addr + aper_size > GART_MAX_ADDR
) {
+ if (!addr) {
printk(KERN_ERR
"Cannot allocate aperture memory hole (%lx,%uK)\n",
addr, aper_size>>10);