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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Set CONFIG_HAVE_ARCH_TRACEHOOK
  sparc: Add task_pt_regs().
  sparc: Add call to tracehook_signal_handler().
  sparc: Create and use TIF_NOTIFY_RESUME.
  sparc: Use tracehook routines in syscall_trace().
  sparc64: tracehook: CONFIG_HAVE_ARCH_TRACEHOOK
  sparc: Add user_stack_pointer().
  sparc64: tracehook_signal_handler
  sparc64: tracehook: TIF_NOTIFY_RESUME
  sparc: Add asm/syscall.h
  sparc64: tracehook syscall
  sparc: enable headers_export again
  sparc, sparc64: use arch/sparc/include
parents 4f31f308 04d91cb8

Makefile

+5 −1
Original line number Diff line number Diff line
@@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64) 
endif



# Where to locate arch specific headers

ifeq ($(ARCH),sparc64)

       hdr-arch  := sparc

else

       hdr-arch  := $(SRCARCH)

endif



KCONFIG_CONFIG	?= .config

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config SPARC 
	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB if !SMP

	select HAVE_ARCH_TRACEHOOK



# Identify this as a Sparc32 build

config SPARC32

arch/sparc/include/asm/Kbuild

0 → 100644
+45 −0
Original line number Diff line number Diff line 
# User exported sparc header files

include include/asm-generic/Kbuild.asm



header-y += ipcbuf_32.h

header-y += ipcbuf_64.h

header-y += posix_types_32.h

header-y += posix_types_64.h

header-y += ptrace_32.h

header-y += ptrace_64.h

header-y += sigcontext_32.h

header-y += sigcontext_64.h

header-y += siginfo_32.h

header-y += siginfo_64.h

header-y += signal_32.h

header-y += signal_64.h

header-y += stat_32.h

header-y += stat_64.h

header-y += statfs_32.h

header-y += statfs_64.h

header-y += unistd_32.h

header-y += unistd_64.h



header-y += apc.h

header-y += asi.h

header-y += bpp.h

header-y += display7seg.h

header-y += envctrl.h

header-y += fbio.h

header-y += jsflash.h

header-y += openprom.h

header-y += openprom_32.h

header-y += openprom_64.h

header-y += openpromio.h

header-y += perfctr.h

header-y += psrcompat.h

header-y += psr.h

header-y += pstate.h

header-y += reg.h

header-y += reg_32.h

header-y += reg_64.h

header-y += traps.h

header-y += uctx.h

header-y += utrap.h

header-y += vfc_ioctls.h

header-y += watchdog.h

include/asm-sparc/agp.h→arch/sparc/include/asm/agp.h

+0 −0

File moved.

View file

include/asm-sparc/apb.h→arch/sparc/include/asm/apb.h

+0 −0

File moved.

View file