Skip to content

Commit 3d9de19

Browse files
torvaldstorvalds
committed
Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for Alpha from David Howells: "I've been asked to send the Alpha UAPI disintegration to you directly. The acks I have been given have been added into the patch." * tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate arch/alpha/include/asm
2 parents 9a8a570 + 96433f6 commit 3d9de19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1349
-1275
lines changed

‎arch/alpha/include/asm/Kbuild

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
include include/asm-generic/Kbuild.asm
21

32
generic-y += clkdev.h
43

5-
header-y += compiler.h
6-
header-y += console.h
7-
header-y += fpu.h
8-
header-y += gentrap.h
9-
header-y += pal.h
10-
header-y += reg.h
11-
header-y += regdef.h
12-
header-y += sysinfo.h
134
generic-y += exec.h
145
generic-y += trace_clock.h

‎arch/alpha/include/asm/a.out.h

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,8 @@
11
#ifndef __ALPHA_A_OUT_H__
22
#define __ALPHA_A_OUT_H__
33

4-
#include <linux/types.h>
4+
#include <uapi/asm/a.out.h>
55

6-
/*
7-
* OSF/1 ECOFF header structs. ECOFF files consist of:
8-
* - a file header (struct filehdr),
9-
* - an a.out header (struct aouthdr),
10-
* - one or more section headers (struct scnhdr).
11-
* The filhdr's "f_nscns" field contains the
12-
* number of section headers.
13-
*/
14-
15-
struct filehdr
16-
{
17-
/* OSF/1 "file" header */
18-
__u16 f_magic, f_nscns;
19-
__u32 f_timdat;
20-
__u64 f_symptr;
21-
__u32 f_nsyms;
22-
__u16 f_opthdr, f_flags;
23-
};
24-
25-
struct aouthdr
26-
{
27-
__u64 info; /* after that it looks quite normal.. */
28-
__u64 tsize;
29-
__u64 dsize;
30-
__u64 bsize;
31-
__u64 entry;
32-
__u64 text_start; /* with a few additions that actually make sense */
33-
__u64 data_start;
34-
__u64 bss_start;
35-
__u32 gprmask, fprmask; /* bitmask of general & floating point regs used in binary */
36-
__u64 gpvalue;
37-
};
38-
39-
struct scnhdr
40-
{
41-
char s_name[8];
42-
__u64 s_paddr;
43-
__u64 s_vaddr;
44-
__u64 s_size;
45-
__u64 s_scnptr;
46-
__u64 s_relptr;
47-
__u64 s_lnnoptr;
48-
__u16 s_nreloc;
49-
__u16 s_nlnno;
50-
__u32 s_flags;
51-
};
52-
53-
struct exec
54-
{
55-
/* OSF/1 "file" header */
56-
struct filehdr fh;
57-
struct aouthdr ah;
58-
};
59-
60-
/*
61-
* Define's so that the kernel exec code can access the a.out header
62-
* fields...
63-
*/
64-
#define a_info ah.info
65-
#define a_text ah.tsize
66-
#define a_data ah.dsize
67-
#define a_bss ah.bsize
68-
#define a_entry ah.entry
69-
#define a_textstart ah.text_start
70-
#define a_datastart ah.data_start
71-
#define a_bssstart ah.bss_start
72-
#define a_gprmask ah.gprmask
73-
#define a_fprmask ah.fprmask
74-
#define a_gpvalue ah.gpvalue
75-
76-
#define N_TXTADDR(x) ((x).a_textstart)
77-
#define N_DATADDR(x) ((x).a_datastart)
78-
#define N_BSSADDR(x) ((x).a_bssstart)
79-
#define N_DRSIZE(x) 0
80-
#define N_TRSIZE(x) 0
81-
#define N_SYMSIZE(x) 0
82-
83-
#define AOUTHSZ sizeof(struct aouthdr)
84-
#define SCNHSZ sizeof(struct scnhdr)
85-
#define SCNROUND 16
86-
87-
#define N_TXTOFF(x) \
88-
((long) N_MAGIC(x) == ZMAGIC ? 0 : \
89-
(sizeof(struct exec) + (x).fh.f_nscns*SCNHSZ + SCNROUND - 1) & ~(SCNROUND - 1))
90-
91-
#ifdef __KERNEL__
926

937
/* Assume that start addresses below 4G belong to a TASO application.
948
Unfortunately, there is no proper bit in the exec header to check.
@@ -98,5 +12,4 @@ struct exec
9812
set_personality (((BFPM->taso || EX.ah.entry < 0x100000000L \
9913
? ADDR_LIMIT_32BIT : 0) | PER_OSF4))
10014

101-
#endif /* __KERNEL__ */
10215
#endif /* __A_OUT_GNU_H__ */

‎arch/alpha/include/asm/compiler.h

Lines changed: 1 addition & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,8 @@
11
#ifndef __ALPHA_COMPILER_H
22
#define __ALPHA_COMPILER_H
33

4-
/*
5-
* Herein are macros we use when describing various patterns we want to GCC.
6-
* In all cases we can get better schedules out of the compiler if we hide
7-
* as little as possible inside inline assembly. However, we want to be
8-
* able to know what we'll get out before giving up inline assembly. Thus
9-
* these tests and macros.
10-
*/
4+
#include <uapi/asm/compiler.h>
115

12-
#if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
13-
# define __kernel_insbl(val, shift) __builtin_alpha_insbl(val, shift)
14-
# define __kernel_inswl(val, shift) __builtin_alpha_inswl(val, shift)
15-
# define __kernel_insql(val, shift) __builtin_alpha_insql(val, shift)
16-
# define __kernel_inslh(val, shift) __builtin_alpha_inslh(val, shift)
17-
# define __kernel_extbl(val, shift) __builtin_alpha_extbl(val, shift)
18-
# define __kernel_extwl(val, shift) __builtin_alpha_extwl(val, shift)
19-
# define __kernel_cmpbge(a, b) __builtin_alpha_cmpbge(a, b)
20-
#else
21-
# define __kernel_insbl(val, shift) \
22-
({ unsigned long __kir; \
23-
__asm__("insbl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
24-
__kir; })
25-
# define __kernel_inswl(val, shift) \
26-
({ unsigned long __kir; \
27-
__asm__("inswl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
28-
__kir; })
29-
# define __kernel_insql(val, shift) \
30-
({ unsigned long __kir; \
31-
__asm__("insql %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
32-
__kir; })
33-
# define __kernel_inslh(val, shift) \
34-
({ unsigned long __kir; \
35-
__asm__("inslh %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
36-
__kir; })
37-
# define __kernel_extbl(val, shift) \
38-
({ unsigned long __kir; \
39-
__asm__("extbl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
40-
__kir; })
41-
# define __kernel_extwl(val, shift) \
42-
({ unsigned long __kir; \
43-
__asm__("extwl %2,%1,%0" : "=r"(__kir) : "rI"(shift), "r"(val)); \
44-
__kir; })
45-
# define __kernel_cmpbge(a, b) \
46-
({ unsigned long __kir; \
47-
__asm__("cmpbge %r2,%1,%0" : "=r"(__kir) : "rI"(b), "rJ"(a)); \
48-
__kir; })
49-
#endif
50-
51-
#ifdef __alpha_cix__
52-
# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
53-
# define __kernel_cttz(x) __builtin_ctzl(x)
54-
# define __kernel_ctlz(x) __builtin_clzl(x)
55-
# define __kernel_ctpop(x) __builtin_popcountl(x)
56-
# else
57-
# define __kernel_cttz(x) \
58-
({ unsigned long __kir; \
59-
__asm__("cttz %1,%0" : "=r"(__kir) : "r"(x)); \
60-
__kir; })
61-
# define __kernel_ctlz(x) \
62-
({ unsigned long __kir; \
63-
__asm__("ctlz %1,%0" : "=r"(__kir) : "r"(x)); \
64-
__kir; })
65-
# define __kernel_ctpop(x) \
66-
({ unsigned long __kir; \
67-
__asm__("ctpop %1,%0" : "=r"(__kir) : "r"(x)); \
68-
__kir; })
69-
# endif
70-
#else
71-
# define __kernel_cttz(x) \
72-
({ unsigned long __kir; \
73-
__asm__(".arch ev67; cttz %1,%0" : "=r"(__kir) : "r"(x)); \
74-
__kir; })
75-
# define __kernel_ctlz(x) \
76-
({ unsigned long __kir; \
77-
__asm__(".arch ev67; ctlz %1,%0" : "=r"(__kir) : "r"(x)); \
78-
__kir; })
79-
# define __kernel_ctpop(x) \
80-
({ unsigned long __kir; \
81-
__asm__(".arch ev67; ctpop %1,%0" : "=r"(__kir) : "r"(x)); \
82-
__kir; })
83-
#endif
84-
85-
86-
/*
87-
* Beginning with EGCS 1.1, GCC defines __alpha_bwx__ when the BWX
88-
* extension is enabled. Previous versions did not define anything
89-
* we could test during compilation -- too bad, so sad.
90-
*/
91-
92-
#if defined(__alpha_bwx__)
93-
#define __kernel_ldbu(mem) (mem)
94-
#define __kernel_ldwu(mem) (mem)
95-
#define __kernel_stb(val,mem) ((mem) = (val))
96-
#define __kernel_stw(val,mem) ((mem) = (val))
97-
#else
98-
#define __kernel_ldbu(mem) \
99-
({ unsigned char __kir; \
100-
__asm__(".arch ev56; \
101-
ldbu %0,%1" : "=r"(__kir) : "m"(mem)); \
102-
__kir; })
103-
#define __kernel_ldwu(mem) \
104-
({ unsigned short __kir; \
105-
__asm__(".arch ev56; \
106-
ldwu %0,%1" : "=r"(__kir) : "m"(mem)); \
107-
__kir; })
108-
#define __kernel_stb(val,mem) \
109-
__asm__(".arch ev56; \
110-
stb %1,%0" : "=m"(mem) : "r"(val))
111-
#define __kernel_stw(val,mem) \
112-
__asm__(".arch ev56; \
113-
stw %1,%0" : "=m"(mem) : "r"(val))
114-
#endif
115-
116-
#ifdef __KERNEL__
1176
/* Some idiots over in <linux/compiler.h> thought inline should imply
1187
always_inline. This breaks stuff. We'll include this file whenever
1198
we run into such problems. */
@@ -125,6 +14,4 @@
12514
#undef __always_inline
12615
#define __always_inline inline __attribute__((always_inline))
12716

128-
#endif /* __KERNEL__ */
129-
13017
#endif /* __ALPHA_COMPILER_H */

‎arch/alpha/include/asm/console.h

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,8 @@
11
#ifndef __AXP_CONSOLE_H
22
#define __AXP_CONSOLE_H
33

4-
/*
5-
* Console callback routine numbers
6-
*/
7-
#define CCB_GETC 0x01
8-
#define CCB_PUTS 0x02
9-
#define CCB_RESET_TERM 0x03
10-
#define CCB_SET_TERM_INT 0x04
11-
#define CCB_SET_TERM_CTL 0x05
12-
#define CCB_PROCESS_KEYCODE 0x06
13-
#define CCB_OPEN_CONSOLE 0x07
14-
#define CCB_CLOSE_CONSOLE 0x08
4+
#include <uapi/asm/console.h>
155

16-
#define CCB_OPEN 0x10
17-
#define CCB_CLOSE 0x11
18-
#define CCB_IOCTL 0x12
19-
#define CCB_READ 0x13
20-
#define CCB_WRITE 0x14
21-
22-
#define CCB_SET_ENV 0x20
23-
#define CCB_RESET_ENV 0x21
24-
#define CCB_GET_ENV 0x22
25-
#define CCB_SAVE_ENV 0x23
26-
27-
#define CCB_PSWITCH 0x30
28-
#define CCB_BIOS_EMUL 0x32
29-
30-
/*
31-
* Environment variable numbers
32-
*/
33-
#define ENV_AUTO_ACTION 0x01
34-
#define ENV_BOOT_DEV 0x02
35-
#define ENV_BOOTDEF_DEV 0x03
36-
#define ENV_BOOTED_DEV 0x04
37-
#define ENV_BOOT_FILE 0x05
38-
#define ENV_BOOTED_FILE 0x06
39-
#define ENV_BOOT_OSFLAGS 0x07
40-
#define ENV_BOOTED_OSFLAGS 0x08
41-
#define ENV_BOOT_RESET 0x09
42-
#define ENV_DUMP_DEV 0x0A
43-
#define ENV_ENABLE_AUDIT 0x0B
44-
#define ENV_LICENSE 0x0C
45-
#define ENV_CHAR_SET 0x0D
46-
#define ENV_LANGUAGE 0x0E
47-
#define ENV_TTY_DEV 0x0F
48-
49-
#ifdef __KERNEL__
506
#ifndef __ASSEMBLY__
517
extern long callback_puts(long unit, const char *s, long length);
528
extern long callback_getc(long unit);
@@ -70,6 +26,4 @@ struct hwrpb_struct;
7026
extern int callback_init_done;
7127
extern void * callback_init(void *);
7228
#endif /* __ASSEMBLY__ */
73-
#endif /* __KERNEL__ */
74-
7529
#endif /* __AXP_CONSOLE_H */

0 commit comments

Comments
 (0)