Skip to content

Commit

Permalink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history
…t/sam/sparc
  • Loading branch information
David S. Miller committed Jul 28, 2008
2 parents c9272c4 + a1bd021 commit 5cfc177
Show file tree
Hide file tree
Showing 493 changed files with 197 additions and 312 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
45 changes: 45 additions & 0 deletions arch/sparc/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/auxio.h → arch/sparc/include/asm/auxio.h
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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)
*/
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion include/asm-sparc/bugs.h → arch/sparc/include/asm/bugs.h
Original file line number Diff line number Diff line change
@@ -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)
*/
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/delay.h → arch/sparc/include/asm/delay.h
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/dma.h → arch/sparc/include/asm/dma.h
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* include/asm-sparc/dma.h
/* include/asm/dma.h
*
* Copyright 1995 (C) David S. Miller (davem@davemloft.net)
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* include/asm-sparc64/dma.h
* include/asm/dma.h
*
* Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
*/
Expand Down
4 changes: 2 additions & 2 deletions include/asm-sparc/ebus.h → arch/sparc/include/asm/ebus.h
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/elf.h → arch/sparc/include/asm/elf.h
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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)
*/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/futex.h → arch/sparc/include/asm/futex.h
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/head.h → arch/sparc/include/asm/head.h
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/io.h → arch/sparc/include/asm/io.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_IO_H
#define ___ASM_SPARC_IO_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/io_64.h>
#include <asm/io_64.h>
#else
#include <asm-sparc/io_32.h>
#include <asm/io_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/iommu.h → arch/sparc/include/asm/iommu.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_IOMMU_H
#define ___ASM_SPARC_IOMMU_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/iommu_64.h>
#include <asm/iommu_64.h>
#else
#include <asm-sparc/iommu_32.h>
#include <asm/iommu_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_IPCBUF_H
#define ___ASM_SPARC_IPCBUF_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/ipcbuf_64.h>
#include <asm/ipcbuf_64.h>
#else
#include <asm-sparc/ipcbuf_32.h>
#include <asm/ipcbuf_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/irq.h → arch/sparc/include/asm/irq.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_IRQ_H
#define ___ASM_SPARC_IRQ_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/irq_64.h>
#include <asm/irq_64.h>
#else
#include <asm-sparc/irq_32.h>
#include <asm/irq_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_IRQFLAGS_H
#define ___ASM_SPARC_IRQFLAGS_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/irqflags_64.h>
#include <asm/irqflags_64.h>
#else
#include <asm-sparc/irqflags_32.h>
#include <asm/irqflags_32.h>
#endif
#endif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* include/asm-sparc/irqflags.h
* include/asm/irqflags.h
*
* IRQ flags handling
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* include/asm-sparc64/irqflags.h
* include/asm/irqflags.h
*
* IRQ flags handling
*
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_KDEBUG_H
#define ___ASM_SPARC_KDEBUG_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/kdebug_64.h>
#include <asm/kdebug_64.h>
#else
#include <asm-sparc/kdebug_32.h>
#include <asm/kdebug_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_MC146818RTC_H
#define ___ASM_SPARC_MC146818RTC_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/mc146818rtc_64.h>
#include <asm/mc146818rtc_64.h>
#else
#include <asm-sparc/mc146818rtc_32.h>
#include <asm/mc146818rtc_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions include/asm-sparc/mmu.h → arch/sparc/include/asm/mmu.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_MMU_H
#define ___ASM_SPARC_MMU_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/mmu_64.h>
#include <asm/mmu_64.h>
#else
#include <asm-sparc/mmu_32.h>
#include <asm/mmu_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ___ASM_SPARC_MMU_CONTEXT_H
#define ___ASM_SPARC_MMU_CONTEXT_H
#if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/mmu_context_64.h>
#include <asm/mmu_context_64.h>
#else
#include <asm-sparc/mmu_context_32.h>
#include <asm/mmu_context_32.h>
#endif
#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 5cfc177

Please sign in to comment.