Skip to content
Snippets Groups Projects
Commit a439fe51 authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

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
Branches
Tags
No related merge requests found
Showing
with 12 additions and 12 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* *
* Copyright (C) 2004 Keith M Wesolowski (wesolows@foobazco.org) * 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. * both (C) David S. Miller.
*/ */
......
File moved
/* include/asm-sparc/current.h /* include/asm/current.h
* *
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com) * Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com)
......
File moved
File moved
File moved
#ifndef ___ASM_SPARC_DELAY_H #ifndef ___ASM_SPARC_DELAY_H
#define ___ASM_SPARC_DELAY_H #define ___ASM_SPARC_DELAY_H
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/delay_64.h> #include <asm/delay_64.h>
#else #else
#include <asm-sparc/delay_32.h> #include <asm/delay_32.h>
#endif #endif
#endif #endif
File moved
File moved
File moved
File moved
#ifndef ___ASM_SPARC_DMA_MAPPING_H #ifndef ___ASM_SPARC_DMA_MAPPING_H
#define ___ASM_SPARC_DMA_MAPPING_H #define ___ASM_SPARC_DMA_MAPPING_H
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/dma-mapping_64.h> #include <asm/dma-mapping_64.h>
#else #else
#include <asm-sparc/dma-mapping_32.h> #include <asm/dma-mapping_32.h>
#endif #endif
#endif #endif
#ifndef ___ASM_SPARC_DMA_H #ifndef ___ASM_SPARC_DMA_H
#define ___ASM_SPARC_DMA_H #define ___ASM_SPARC_DMA_H
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/dma_64.h> #include <asm/dma_64.h>
#else #else
#include <asm-sparc/dma_32.h> #include <asm/dma_32.h>
#endif #endif
#endif #endif
/* include/asm-sparc/dma.h /* include/asm/dma.h
* *
* Copyright 1995 (C) David S. Miller (davem@davemloft.net) * 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) * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu)
*/ */
......
#ifndef ___ASM_SPARC_EBUS_H #ifndef ___ASM_SPARC_EBUS_H
#define ___ASM_SPARC_EBUS_H #define ___ASM_SPARC_EBUS_H
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
#include <asm-sparc/ebus_64.h> #include <asm/ebus_64.h>
#else #else
#include <asm-sparc/ebus_32.h> #include <asm/ebus_32.h>
#endif #endif
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment