sh: Fix up some merge damage.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user