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

Commit 9cd77374 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc update from Helge Deller:
 "The major change in here is the removal of the old HP-UX compat code
  which should have made it possible to load and execute 32-bit HP-UX
  binaries on PA-RISC Linux.  Since it was never functional and since
  nobody cares about old 32-bit HPUX binaries any longer, it's now time
  to free up 3200 lines of kernel code (CONFIG_HPUX and
  CONFIG_BINFMT_SOM).

  Other than that we wire up the execveat() syscall, fix sparse errors
  and have some whitespace cleanups"

* 'parisc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  fs/binfmt_som: Drop kernel support for HP-UX SOM binaries
  parisc: Remove unused function
  parisc: macro whitespace fixes
  parisc/uaccess: fix sparse errors
  parisc: hpux - Remove HPUX syscall numbers
  parisc: hpux - Remove hpux gateway page
  parisc: hpux - Delete files in hpux subdirectory
  parisc: hpux - Do not compile hpux subdirectory
  parisc: hpux - Drop support for HP-UX binaries
  parisc: Add error checks when building up signal trampoline handler
  parisc: Wire up execveat syscall
parents b0f0c26a 35e88d5c

arch/parisc/Kconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -291,10 +291,6 @@ config SYSVIPC_COMPAT 
config AUDIT_ARCH

config AUDIT_ARCH

	def_bool y

	def_bool y





config HPUX

	bool "Support for HP-UX binaries"

	depends on !64BIT



config NR_CPUS

config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	int "Maximum number of CPUs (2-32)"

	range 2 32

	range 2 32

arch/parisc/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ head-y := arch/parisc/kernel/head.o 
KBUILD_CFLAGS	+= $(cflags-y)

KBUILD_CFLAGS	+= $(cflags-y)





kernel-y			:= mm/ kernel/ math-emu/

kernel-y			:= mm/ kernel/ math-emu/

kernel-$(CONFIG_HPUX)		+= hpux/





core-y	+= $(addprefix arch/parisc/, $(kernel-y))

core-y	+= $(addprefix arch/parisc/, $(kernel-y))

libs-y	+= arch/parisc/lib/ $(LIBGCC)

libs-y	+= arch/parisc/lib/ $(LIBGCC)

arch/parisc/hpux/Makefile

deleted100644 → 0
+0 −5
Original line number Original line Diff line number Diff line 
#

# Makefile for HPUX emulation

#



obj-y := entry_hpux.o gate.o wrappers.o fs.o ioctl.o sys_hpux.o

arch/parisc/hpux/entry_hpux.S

deleted100644 → 0
+0 −546

File deleted.

Preview size limit exceeded, changes collapsed.

arch/parisc/hpux/fs.c

deleted100644 → 0
+0 −192

File deleted.

Preview size limit exceeded, changes collapsed.