Commit a439fe51 authored by Sam Ravnborg's avatar Sam Ravnborg

sparc, sparc64: use arch/sparc/include

The majority of this patch was created by the following script:

***
ASM=arch/sparc/include/asm
mkdir -p $ASM
git mv include/asm-sparc64/ftrace.h $ASM
git rm include/asm-sparc64/*
git mv include/asm-sparc/* $ASM
sed -ie 's/asm-sparc64/asm/g' $ASM/*
sed -ie 's/asm-sparc/asm/g' $ASM/*
***

The rest was an update of the top-level Makefile to use sparc
for header files when sparc64 is being build.
And a small fixlet to pick up the correct unistd.h from
sparc64 code.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 837b41b5
......@@ -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
......
#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
#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
......
#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
/*
* 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)
*/
......
/* 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)
*/
......
#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
#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
#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.
*/
......
/* 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)
......
#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
#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
#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
/* include/asm-sparc/dma.h
/* include/asm/dma.h
*
* Copyright 1995 (C) David S. Miller (davem@davemloft.net)
*/
......
/*
* include/asm-sparc64/dma.h
* include/asm/dma.h
*
* Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
*/
......
#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
#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
#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
/* 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)
*/
......
#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
#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
#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
#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