diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 13:04:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-09 13:04:59 -0800 |
| commit | 50569687e9c688a8688982805be6d8e3c8879042 (patch) | |
| tree | bd01cba8f9ba9f260650b42e958af36a1089ad42 | |
| parent | a4a26e8e924a8e2412b63276c1a23cc127997a73 (diff) | |
| parent | f0b99a643e9613beb28af43333bbfa90d4bf85cc (diff) | |
| download | linux-50569687e9c688a8688982805be6d8e3c8879042.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/mm: Eliminate memset after alloc_bootmem_pages nubus: Remove superfluous interrupt disable/restore
| -rw-r--r-- | arch/m68k/mm/init.c | 1 | ||||
| -rw-r--r-- | drivers/nubus/nubus.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c index acaff6a49e35..b09a3cb29b68 100644 --- a/arch/m68k/mm/init.c +++ b/arch/m68k/mm/init.c @@ -94,7 +94,6 @@ void __init paging_init(void) high_memory = (void *) end_mem; empty_zero_page = alloc_bootmem_pages(PAGE_SIZE); - memset(empty_zero_page, 0, PAGE_SIZE); /* * Set up SFC/DFC registers (user data space). diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index 5066a7ef7b6c..3319cf19deeb 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c @@ -920,14 +920,10 @@ void __init nubus_probe_slot(int slot) rp = nubus_rom_addr(slot); for(i = 4; i; i--) { - unsigned long flags; int card_present; rp--; - local_irq_save(flags); card_present = hwreg_present(rp); - local_irq_restore(flags); - if (!card_present) continue; |