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

Commit 9a19eb2a authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up some merge damage. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4cb40f79

arch/sh/include/asm/elf.h

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ do { \ 
} while (0)

#endif



#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)



#ifdef CONFIG_VSYSCALL

/* vDSO has arch_setup_additional_pages */

#define ARCH_HAS_SETUP_ADDITIONAL_PAGES

arch/sh/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) 
			printk("initrd extends beyond end of memory "

			       "(0x%08lx > 0x%08lx)\ndisabling initrd\n",

			       initrd_start_phys + INITRD_SIZE,

			       PFN_PHYS(max_low_pfn));

			       (unsigned long)PFN_PHYS(max_low_pfn));

			initrd_start = 0;

		}

	}