diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 17:00:59 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-07-27 17:00:59 -0400 |
commit | a439fe51a1f8eb087c22dd24d69cebae4a3addac (patch) | |
tree | e32d1fa97a220ab598d8ab364205817c5bf2bd6f /include/asm-sparc/sembuf.h | |
parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) |
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: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc/sembuf.h')
-rw-r--r-- | include/asm-sparc/sembuf.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/include/asm-sparc/sembuf.h b/include/asm-sparc/sembuf.h deleted file mode 100644 index faee1be08d67..000000000000 --- a/include/asm-sparc/sembuf.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #ifndef _SPARC_SEMBUF_H | ||
2 | #define _SPARC_SEMBUF_H | ||
3 | |||
4 | /* | ||
5 | * The semid64_ds structure for sparc architecture. | ||
6 | * Note extra padding because this structure is passed back and forth | ||
7 | * between kernel and user space. | ||
8 | * | ||
9 | * Pad space is left for: | ||
10 | * - 64-bit time_t to solve y2038 problem | ||
11 | * - 2 miscellaneous 32-bit values | ||
12 | */ | ||
13 | #if defined(__sparc__) && defined(__arch64__) | ||
14 | # define PADDING(x) | ||
15 | #else | ||
16 | # define PADDING(x) unsigned int x; | ||
17 | #endif | ||
18 | |||
19 | struct semid64_ds { | ||
20 | struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ | ||
21 | PADDING(__pad1) | ||
22 | __kernel_time_t sem_otime; /* last semop time */ | ||
23 | PADDING(__pad2) | ||
24 | __kernel_time_t sem_ctime; /* last change time */ | ||
25 | unsigned long sem_nsems; /* no. of semaphores in array */ | ||
26 | unsigned long __unused1; | ||
27 | unsigned long __unused2; | ||
28 | }; | ||
29 | #undef PADDING | ||
30 | |||
31 | #endif /* _SPARC64_SEMBUF_H */ | ||