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
This commit is contained in:
commit
c32f1a34ff
Makefile
arch/sparc
Kconfig
include/asm
Kbuildagp.hapb.hapc.hasi.hasmmacro.hatomic.hatomic_32.hatomic_64.hauxio.hauxio_32.hauxio_64.hauxvec.hbackoff.hbbc.hbitext.hbitops.hbitops_32.hbitops_64.hbpp.hbtfixup.hbug.hbugs.hbyteorder.hcache.hcacheflush.hcacheflush_32.hcacheflush_64.hchafsr.hchecksum.hchecksum_32.hchecksum_64.hchmctrl.hclock.hcmt.hcompat.hcompat_signal.hcontregs.hcpudata.hcpudata_32.hcpudata_64.hcputime.hcurrent.hcypress.hdcr.hdcu.hdelay.hdelay_32.hdelay_64.hdevice.hdisplay7seg.hdiv64.hdma-mapping.hdma-mapping_32.hdma-mapping_64.hdma.hdma_32.hdma_64.hebus.hebus_32.hebus_64.hecc.heeprom.helf.helf_32.helf_64.hemergency-restart.henvctrl.herrno.hestate.hfb.hfbio.hfcntl.hfhc.hfixmap.hfloppy.hfloppy_32.hfloppy_64.hfpumacro.hftrace.hfutex.hfutex_32.hfutex_64.hhardirq.hhardirq_32.hhardirq_64.hhead.hhead_32.hhead_64.hhighmem.hhugetlb.hhvtramp.hhw_irq.hhypervisor.hide.hidprom.hintr_queue.hio-unit.h
6
Makefile
6
Makefile
@ -206,7 +206,11 @@ ifeq ($(ARCH),x86_64)
|
||||
endif
|
||||
|
||||
# Where to locate arch specific headers
|
||||
hdr-arch := $(SRCARCH)
|
||||
ifeq ($(ARCH),sparc64)
|
||||
hdr-arch := sparc
|
||||
else
|
||||
hdr-arch := $(SRCARCH)
|
||||
endif
|
||||
|
||||
KCONFIG_CONFIG ?= .config
|
||||
|
||||
|
@ -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
|
||||
|
45
arch/sparc/include/asm/Kbuild
Normal file
45
arch/sparc/include/asm/Kbuild
Normal file
@ -0,0 +1,45 @@
|
||||
# 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
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_ATOMIC_H
|
||||
#define ___ASM_SPARC_ATOMIC_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/atomic_64.h>
|
||||
#include <asm/atomic_64.h>
|
||||
#else
|
||||
#include <asm-sparc/atomic_32.h>
|
||||
#include <asm/atomic_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_AUXIO_H
|
||||
#define ___ASM_SPARC_AUXIO_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/auxio_64.h>
|
||||
#include <asm/auxio_64.h>
|
||||
#else
|
||||
#include <asm-sparc/auxio_32.h>
|
||||
#include <asm/auxio_32.h>
|
||||
#endif
|
||||
#endif
|
@ -36,7 +36,7 @@
|
||||
* understand the hardware you are querying!
|
||||
*/
|
||||
extern void set_auxio(unsigned char bits_on, unsigned char bits_off);
|
||||
extern unsigned char get_auxio(void); /* .../asm-sparc/floppy.h */
|
||||
extern unsigned char get_auxio(void); /* .../asm/floppy.h */
|
||||
|
||||
/*
|
||||
* The following routines are provided for driver-compatibility
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_BITOPS_H
|
||||
#define ___ASM_SPARC_BITOPS_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/bitops_64.h>
|
||||
#include <asm/bitops_64.h>
|
||||
#else
|
||||
#include <asm-sparc/bitops_32.h>
|
||||
#include <asm/bitops_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* asm-sparc/btfixup.h: Macros for boot time linking.
|
||||
* asm/btfixup.h: Macros for boot time linking.
|
||||
*
|
||||
* Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
|
||||
*/
|
@ -1,4 +1,4 @@
|
||||
/* include/asm-sparc/bugs.h: Sparc probes for various bugs.
|
||||
/* include/asm/bugs.h: Sparc probes for various bugs.
|
||||
*
|
||||
* Copyright (C) 1996, 2007 David S. Miller (davem@davemloft.net)
|
||||
*/
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_CACHEFLUSH_H
|
||||
#define ___ASM_SPARC_CACHEFLUSH_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/cacheflush_64.h>
|
||||
#include <asm/cacheflush_64.h>
|
||||
#else
|
||||
#include <asm-sparc/cacheflush_32.h>
|
||||
#include <asm/cacheflush_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_CHECKSUM_H
|
||||
#define ___ASM_SPARC_CHECKSUM_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/checksum_64.h>
|
||||
#include <asm/checksum_64.h>
|
||||
#else
|
||||
#include <asm-sparc/checksum_32.h>
|
||||
#include <asm/checksum_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_CPUDATA_H
|
||||
#define ___ASM_SPARC_CPUDATA_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/cpudata_64.h>
|
||||
#include <asm/cpudata_64.h>
|
||||
#else
|
||||
#include <asm-sparc/cpudata_32.h>
|
||||
#include <asm/cpudata_32.h>
|
||||
#endif
|
||||
#endif
|
@ -2,7 +2,7 @@
|
||||
*
|
||||
* Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org)
|
||||
*
|
||||
* Based on include/asm-sparc64/cpudata.h and Linux 2.4 smp.h
|
||||
* Based on include/asm/cpudata.h and Linux 2.4 smp.h
|
||||
* both (C) David S. Miller.
|
||||
*/
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* include/asm-sparc/current.h
|
||||
/* include/asm/current.h
|
||||
*
|
||||
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
|
||||
* Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com)
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_DELAY_H
|
||||
#define ___ASM_SPARC_DELAY_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/delay_64.h>
|
||||
#include <asm/delay_64.h>
|
||||
#else
|
||||
#include <asm-sparc/delay_32.h>
|
||||
#include <asm/delay_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_DMA_MAPPING_H
|
||||
#define ___ASM_SPARC_DMA_MAPPING_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/dma-mapping_64.h>
|
||||
#include <asm/dma-mapping_64.h>
|
||||
#else
|
||||
#include <asm-sparc/dma-mapping_32.h>
|
||||
#include <asm/dma-mapping_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_DMA_H
|
||||
#define ___ASM_SPARC_DMA_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/dma_64.h>
|
||||
#include <asm/dma_64.h>
|
||||
#else
|
||||
#include <asm-sparc/dma_32.h>
|
||||
#include <asm/dma_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,4 +1,4 @@
|
||||
/* include/asm-sparc/dma.h
|
||||
/* include/asm/dma.h
|
||||
*
|
||||
* Copyright 1995 (C) David S. Miller (davem@davemloft.net)
|
||||
*/
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* include/asm-sparc64/dma.h
|
||||
* include/asm/dma.h
|
||||
*
|
||||
* Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
|
||||
*/
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_EBUS_H
|
||||
#define ___ASM_SPARC_EBUS_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/ebus_64.h>
|
||||
#include <asm/ebus_64.h>
|
||||
#else
|
||||
#include <asm-sparc/ebus_32.h>
|
||||
#include <asm/ebus_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_ELF_H
|
||||
#define ___ASM_SPARC_ELF_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/elf_64.h>
|
||||
#include <asm/elf_64.h>
|
||||
#else
|
||||
#include <asm-sparc/elf_32.h>
|
||||
#include <asm/elf_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_FLOPPY_H
|
||||
#define ___ASM_SPARC_FLOPPY_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/floppy_64.h>
|
||||
#include <asm/floppy_64.h>
|
||||
#else
|
||||
#include <asm-sparc/floppy_32.h>
|
||||
#include <asm/floppy_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,4 +1,4 @@
|
||||
/* asm-sparc/floppy.h: Sparc specific parts of the Floppy driver.
|
||||
/* asm/floppy.h: Sparc specific parts of the Floppy driver.
|
||||
*
|
||||
* Copyright (C) 1995 David S. Miller (davem@davemloft.net)
|
||||
*/
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_FUTEX_H
|
||||
#define ___ASM_SPARC_FUTEX_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/futex_64.h>
|
||||
#include <asm/futex_64.h>
|
||||
#else
|
||||
#include <asm-sparc/futex_32.h>
|
||||
#include <asm/futex_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_HARDIRQ_H
|
||||
#define ___ASM_SPARC_HARDIRQ_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/hardirq_64.h>
|
||||
#include <asm/hardirq_64.h>
|
||||
#else
|
||||
#include <asm-sparc/hardirq_32.h>
|
||||
#include <asm/hardirq_32.h>
|
||||
#endif
|
||||
#endif
|
@ -1,8 +1,8 @@
|
||||
#ifndef ___ASM_SPARC_HEAD_H
|
||||
#define ___ASM_SPARC_HEAD_H
|
||||
#if defined(__sparc__) && defined(__arch64__)
|
||||
#include <asm-sparc/head_64.h>
|
||||
#include <asm/head_64.h>
|
||||
#else
|
||||
#include <asm-sparc/head_32.h>
|
||||
#include <asm/head_32.h>
|
||||
#endif
|
||||
#endif
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user