Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50569687 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a4a26e8e f0b99a64

arch/m68k/mm/init.c

+0 −1
Original line number Diff line number Diff line
@@ -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).

drivers/nubus/nubus.c

+0 −4
Original line number Diff line number Diff line
@@ -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;