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

Commit 6977c6fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes-for-3.9-latest' of... 

Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull second round of PARISC updates from Helge Deller:
 "The most important fix in this branch is the switch of io_setup,
  io_getevents and io_submit syscalls to use the available compat
  syscalls when running 32bit userspace on 64bit kernel.  Other than
  that it's mostly removal of compile warnings."

* 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix redefinition of SET_PERSONALITY
  parisc: do not install modules when installing kernel
  parisc: fix compile warnings triggered by atomic_sub(sizeof(),v)
  parisc: check return value of down_interruptible() in hp_sdc_rtc.c
  parisc: avoid unitialized variable warning in pa_memcpy()
  parisc: remove unused variable 'compat_val'
  parisc: switch to compat_functions of io_setup, io_getevents and io_submit
  parisc: select ARCH_WANT_FRAME_POINTERS
parents 8fd5e7a2 cf8e18ea

arch/parisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config PARISC 
	select HAVE_FUNCTION_TRACER if 64BIT

	select HAVE_FUNCTION_GRAPH_TRACER if 64BIT

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT

	select ARCH_WANT_FRAME_POINTERS

	select RTC_CLASS

	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

arch/parisc/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -113,12 +113,10 @@ palo: vmlinux 
# Shorthands for known targets not supported by parisc, use vmlinux as default

Image zImage bzImage: vmlinux



kernel_install: vmlinux

install: vmlinux

	sh $(src)/arch/parisc/install.sh \

			$(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"



install: kernel_install modules_install



CLEAN_FILES	+= lifimage

MRPROPER_FILES	+= palo.conf

arch/parisc/include/asm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) 




#define atomic_add(i,v)	((void)(__atomic_add_return(        (i),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-(i),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int) (i)),(v))))

#define atomic_inc(v)	((void)(__atomic_add_return(   1,(v))))

#define atomic_dec(v)	((void)(__atomic_add_return(  -1,(v))))

arch/parisc/kernel/binfmt_elf32.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct elf_prpsinfo32 
 * could set a processor dependent flag in the thread_struct.

 */



#undef SET_PERSONALITY

#define SET_PERSONALITY(ex) \

	set_thread_flag(TIF_32BIT); \

	current->thread.map_base = DEFAULT_MAP_BASE32; \

arch/parisc/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	unsigned long haddr, sigframe_size;

	int err = 0;

#ifdef CONFIG_64BIT

	compat_int_t compat_val;

	struct compat_rt_sigframe __user * compat_frame;

	compat_sigset_t compat_set;

#endif