diff options
Diffstat (limited to 'include')
322 files changed, 615 insertions, 15505 deletions
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h index 813e4b6c2c0d..bf8d4cfd8cf5 100644 --- a/include/acpi/actbl.h +++ b/include/acpi/actbl.h | |||
@@ -245,7 +245,7 @@ struct acpi_table_fadt { | |||
245 | #define ACPI_FADT_POWER_BUTTON (1<<4) /* 04: Power button is handled as a generic feature */ | 245 | #define ACPI_FADT_POWER_BUTTON (1<<4) /* 04: Power button is handled as a generic feature */ |
246 | #define ACPI_FADT_SLEEP_BUTTON (1<<5) /* 05: Sleep button is handled as a generic feature, or not present */ | 246 | #define ACPI_FADT_SLEEP_BUTTON (1<<5) /* 05: Sleep button is handled as a generic feature, or not present */ |
247 | #define ACPI_FADT_FIXED_RTC (1<<6) /* 06: RTC wakeup stat not in fixed register space */ | 247 | #define ACPI_FADT_FIXED_RTC (1<<6) /* 06: RTC wakeup stat not in fixed register space */ |
248 | #define ACPI_FADT_S4_RTC_WAKE (1<<7) /* 07: RTC wakeup stat not possible from S4 */ | 248 | #define ACPI_FADT_S4_RTC_WAKE (1<<7) /* 07: RTC wakeup possible from S4 */ |
249 | #define ACPI_FADT_32BIT_TIMER (1<<8) /* 08: tmr_val is 32 bits 0=24-bits */ | 249 | #define ACPI_FADT_32BIT_TIMER (1<<8) /* 08: tmr_val is 32 bits 0=24-bits */ |
250 | #define ACPI_FADT_DOCKING_SUPPORTED (1<<9) /* 09: Docking supported */ | 250 | #define ACPI_FADT_DOCKING_SUPPORTED (1<<9) /* 09: Docking supported */ |
251 | #define ACPI_FADT_RESET_REGISTER (1<<10) /* 10: System reset via the FADT RESET_REG supported */ | 251 | #define ACPI_FADT_RESET_REGISTER (1<<10) /* 10: System reset via the FADT RESET_REG supported */ |
diff --git a/include/asm-frv/Kbuild b/include/asm-frv/Kbuild index 1f44e7c76995..0f8956def738 100644 --- a/include/asm-frv/Kbuild +++ b/include/asm-frv/Kbuild | |||
@@ -3,4 +3,3 @@ include include/asm-generic/Kbuild.asm | |||
3 | header-y += registers.h | 3 | header-y += registers.h |
4 | 4 | ||
5 | unifdef-y += termios.h | 5 | unifdef-y += termios.h |
6 | unifdef-y += swab.h | ||
diff --git a/include/asm-frv/byteorder.h b/include/asm-frv/byteorder.h index 1187e51ecd13..f29b7593e088 100644 --- a/include/asm-frv/byteorder.h +++ b/include/asm-frv/byteorder.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ASM_BYTEORDER_H | 1 | #ifndef _ASM_BYTEORDER_H |
2 | #define _ASM_BYTEORDER_H | 2 | #define _ASM_BYTEORDER_H |
3 | 3 | ||
4 | #include <asm/swab.h> | ||
5 | #include <linux/byteorder/big_endian.h> | 4 | #include <linux/byteorder/big_endian.h> |
6 | 5 | ||
7 | #endif /* _ASM_BYTEORDER_H */ | 6 | #endif /* _ASM_BYTEORDER_H */ |
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 1870d5e05f1c..70d185534b9d 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm | |||
@@ -31,6 +31,7 @@ unifdef-y += socket.h | |||
31 | unifdef-y += sockios.h | 31 | unifdef-y += sockios.h |
32 | unifdef-y += stat.h | 32 | unifdef-y += stat.h |
33 | unifdef-y += statfs.h | 33 | unifdef-y += statfs.h |
34 | unifdef-y += swab.h | ||
34 | unifdef-y += termbits.h | 35 | unifdef-y += termbits.h |
35 | unifdef-y += termios.h | 36 | unifdef-y += termios.h |
36 | unifdef-y += types.h | 37 | unifdef-y += types.h |
diff --git a/include/asm-generic/bitops/__ffs.h b/include/asm-generic/bitops/__ffs.h index 9a3274aecf83..937d7c435575 100644 --- a/include/asm-generic/bitops/__ffs.h +++ b/include/asm-generic/bitops/__ffs.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Undefined if no bit exists, so code should check against 0 first. | 10 | * Undefined if no bit exists, so code should check against 0 first. |
11 | */ | 11 | */ |
12 | static inline unsigned long __ffs(unsigned long word) | 12 | static __always_inline unsigned long __ffs(unsigned long word) |
13 | { | 13 | { |
14 | int num = 0; | 14 | int num = 0; |
15 | 15 | ||
diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h index be24465403d6..a60a7ccb6782 100644 --- a/include/asm-generic/bitops/__fls.h +++ b/include/asm-generic/bitops/__fls.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Undefined if no set bit exists, so code should check against 0 first. | 10 | * Undefined if no set bit exists, so code should check against 0 first. |
11 | */ | 11 | */ |
12 | static inline unsigned long __fls(unsigned long word) | 12 | static __always_inline unsigned long __fls(unsigned long word) |
13 | { | 13 | { |
14 | int num = BITS_PER_LONG - 1; | 14 | int num = BITS_PER_LONG - 1; |
15 | 15 | ||
diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h index 850859bc5069..0576d1f42f43 100644 --- a/include/asm-generic/bitops/fls.h +++ b/include/asm-generic/bitops/fls.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. | 9 | * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | static inline int fls(int x) | 12 | static __always_inline int fls(int x) |
13 | { | 13 | { |
14 | int r = 32; | 14 | int r = 32; |
15 | 15 | ||
diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h index 86d403f8b256..b097cf8444e3 100644 --- a/include/asm-generic/bitops/fls64.h +++ b/include/asm-generic/bitops/fls64.h | |||
@@ -15,7 +15,7 @@ | |||
15 | * at position 64. | 15 | * at position 64. |
16 | */ | 16 | */ |
17 | #if BITS_PER_LONG == 32 | 17 | #if BITS_PER_LONG == 32 |
18 | static inline int fls64(__u64 x) | 18 | static __always_inline int fls64(__u64 x) |
19 | { | 19 | { |
20 | __u32 h = x >> 32; | 20 | __u32 h = x >> 32; |
21 | if (h) | 21 | if (h) |
@@ -23,7 +23,7 @@ static inline int fls64(__u64 x) | |||
23 | return fls(x); | 23 | return fls(x); |
24 | } | 24 | } |
25 | #elif BITS_PER_LONG == 64 | 25 | #elif BITS_PER_LONG == 64 |
26 | static inline int fls64(__u64 x) | 26 | static __always_inline int fls64(__u64 x) |
27 | { | 27 | { |
28 | if (x == 0) | 28 | if (x == 0) |
29 | return 0; | 29 | return 0; |
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index 89061c1a67d4..763e3b060f43 100644 --- a/include/asm-generic/rtc.h +++ b/include/asm-generic/rtc.h | |||
@@ -42,7 +42,7 @@ static inline unsigned char rtc_is_updating(void) | |||
42 | return uip; | 42 | return uip; |
43 | } | 43 | } |
44 | 44 | ||
45 | static inline unsigned int get_rtc_time(struct rtc_time *time) | 45 | static inline unsigned int __get_rtc_time(struct rtc_time *time) |
46 | { | 46 | { |
47 | unsigned char ctrl; | 47 | unsigned char ctrl; |
48 | unsigned long flags; | 48 | unsigned long flags; |
@@ -108,8 +108,12 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) | |||
108 | return RTC_24H; | 108 | return RTC_24H; |
109 | } | 109 | } |
110 | 110 | ||
111 | #ifndef get_rtc_time | ||
112 | #define get_rtc_time __get_rtc_time | ||
113 | #endif | ||
114 | |||
111 | /* Set the current date and time in the real time clock. */ | 115 | /* Set the current date and time in the real time clock. */ |
112 | static inline int set_rtc_time(struct rtc_time *time) | 116 | static inline int __set_rtc_time(struct rtc_time *time) |
113 | { | 117 | { |
114 | unsigned long flags; | 118 | unsigned long flags; |
115 | unsigned char mon, day, hrs, min, sec; | 119 | unsigned char mon, day, hrs, min, sec; |
@@ -190,11 +194,15 @@ static inline int set_rtc_time(struct rtc_time *time) | |||
190 | return 0; | 194 | return 0; |
191 | } | 195 | } |
192 | 196 | ||
197 | #ifndef set_rtc_time | ||
198 | #define set_rtc_time __set_rtc_time | ||
199 | #endif | ||
200 | |||
193 | static inline unsigned int get_rtc_ss(void) | 201 | static inline unsigned int get_rtc_ss(void) |
194 | { | 202 | { |
195 | struct rtc_time h; | 203 | struct rtc_time h; |
196 | 204 | ||
197 | get_rtc_time(&h); | 205 | __get_rtc_time(&h); |
198 | return h.tm_sec; | 206 | return h.tm_sec; |
199 | } | 207 | } |
200 | 208 | ||
diff --git a/include/asm-m32r/Kbuild b/include/asm-m32r/Kbuild index 27b108a86b39..c68e1680da01 100644 --- a/include/asm-m32r/Kbuild +++ b/include/asm-m32r/Kbuild | |||
@@ -1,2 +1 @@ | |||
1 | include include/asm-generic/Kbuild.asm | include include/asm-generic/Kbuild.asm | |
2 | unifdef-y += swab.h | ||
diff --git a/include/asm-m32r/byteorder.h b/include/asm-m32r/byteorder.h index 61ff9cfd8451..21855d8b028b 100644 --- a/include/asm-m32r/byteorder.h +++ b/include/asm-m32r/byteorder.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef _ASM_M32R_BYTEORDER_H | 1 | #ifndef _ASM_M32R_BYTEORDER_H |
2 | #define _ASM_M32R_BYTEORDER_H | 2 | #define _ASM_M32R_BYTEORDER_H |
3 | 3 | ||
4 | #include <asm/swab.h> | ||
5 | |||
6 | #if defined(__LITTLE_ENDIAN__) | 4 | #if defined(__LITTLE_ENDIAN__) |
7 | # include <linux/byteorder/little_endian.h> | 5 | # include <linux/byteorder/little_endian.h> |
8 | #else | 6 | #else |
diff --git a/include/asm-m68k/Kbuild b/include/asm-m68k/Kbuild deleted file mode 100644 index 52fd96b4142a..000000000000 --- a/include/asm-m68k/Kbuild +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | include include/asm-generic/Kbuild.asm | ||
2 | header-y += cachectl.h | ||
3 | unifdef-y += swab.h | ||
diff --git a/include/asm-m68k/a.out-core.h b/include/asm-m68k/a.out-core.h deleted file mode 100644 index f6bfc1d63ff6..000000000000 --- a/include/asm-m68k/a.out-core.h +++ /dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | /* a.out coredump register dumper | ||
2 | * | ||
3 | * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public Licence | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the Licence, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef _ASM_A_OUT_CORE_H | ||
13 | #define _ASM_A_OUT_CORE_H | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #include <linux/user.h> | ||
18 | #include <linux/elfcore.h> | ||
19 | |||
20 | /* | ||
21 | * fill in the user structure for an a.out core dump | ||
22 | */ | ||
23 | static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) | ||
24 | { | ||
25 | struct switch_stack *sw; | ||
26 | |||
27 | /* changed the size calculations - should hopefully work better. lbt */ | ||
28 | dump->magic = CMAGIC; | ||
29 | dump->start_code = 0; | ||
30 | dump->start_stack = rdusp() & ~(PAGE_SIZE - 1); | ||
31 | dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT; | ||
32 | dump->u_dsize = ((unsigned long) (current->mm->brk + | ||
33 | (PAGE_SIZE-1))) >> PAGE_SHIFT; | ||
34 | dump->u_dsize -= dump->u_tsize; | ||
35 | dump->u_ssize = 0; | ||
36 | |||
37 | if (dump->start_stack < TASK_SIZE) | ||
38 | dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT; | ||
39 | |||
40 | dump->u_ar0 = offsetof(struct user, regs); | ||
41 | sw = ((struct switch_stack *)regs) - 1; | ||
42 | dump->regs.d1 = regs->d1; | ||
43 | dump->regs.d2 = regs->d2; | ||
44 | dump->regs.d3 = regs->d3; | ||
45 | dump->regs.d4 = regs->d4; | ||
46 | dump->regs.d5 = regs->d5; | ||
47 | dump->regs.d6 = sw->d6; | ||
48 | dump->regs.d7 = sw->d7; | ||
49 | dump->regs.a0 = regs->a0; | ||
50 | dump->regs.a1 = regs->a1; | ||
51 | dump->regs.a2 = regs->a2; | ||
52 | dump->regs.a3 = sw->a3; | ||
53 | dump->regs.a4 = sw->a4; | ||
54 | dump->regs.a5 = sw->a5; | ||
55 | dump->regs.a6 = sw->a6; | ||
56 | dump->regs.d0 = regs->d0; | ||
57 | dump->regs.orig_d0 = regs->orig_d0; | ||
58 | dump->regs.stkadj = regs->stkadj; | ||
59 | dump->regs.sr = regs->sr; | ||
60 | dump->regs.pc = regs->pc; | ||
61 | dump->regs.fmtvec = (regs->format << 12) | regs->vector; | ||
62 | /* dump floating point stuff */ | ||
63 | dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp); | ||
64 | } | ||
65 | |||
66 | #endif /* __KERNEL__ */ | ||
67 | #endif /* _ASM_A_OUT_CORE_H */ | ||
diff --git a/include/asm-m68k/a.out.h b/include/asm-m68k/a.out.h deleted file mode 100644 index 3885fe43432a..000000000000 --- a/include/asm-m68k/a.out.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef __M68K_A_OUT_H__ | ||
2 | #define __M68K_A_OUT_H__ | ||
3 | |||
4 | struct exec | ||
5 | { | ||
6 | unsigned long a_info; /* Use macros N_MAGIC, etc for access */ | ||
7 | unsigned a_text; /* length of text, in bytes */ | ||
8 | unsigned a_data; /* length of data, in bytes */ | ||
9 | unsigned a_bss; /* length of uninitialized data area for file, in bytes */ | ||
10 | unsigned a_syms; /* length of symbol table data in file, in bytes */ | ||
11 | unsigned a_entry; /* start address */ | ||
12 | unsigned a_trsize; /* length of relocation info for text, in bytes */ | ||
13 | unsigned a_drsize; /* length of relocation info for data, in bytes */ | ||
14 | }; | ||
15 | |||
16 | #define N_TRSIZE(a) ((a).a_trsize) | ||
17 | #define N_DRSIZE(a) ((a).a_drsize) | ||
18 | #define N_SYMSIZE(a) ((a).a_syms) | ||
19 | |||
20 | #endif /* __M68K_A_OUT_H__ */ | ||
diff --git a/include/asm-m68k/adb_iop.h b/include/asm-m68k/adb_iop.h deleted file mode 100644 index 8a48e56f2d62..000000000000 --- a/include/asm-m68k/adb_iop.h +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | /* | ||
2 | * ADB through the IOP | ||
3 | * Written by Joshua M. Thompson | ||
4 | */ | ||
5 | |||
6 | /* IOP number and channel number for ADB */ | ||
7 | |||
8 | #define ADB_IOP IOP_NUM_ISM | ||
9 | #define ADB_CHAN 2 | ||
10 | |||
11 | /* From the A/UX headers...maybe important, maybe not */ | ||
12 | |||
13 | #define ADB_IOP_LISTEN 0x01 | ||
14 | #define ADB_IOP_TALK 0x02 | ||
15 | #define ADB_IOP_EXISTS 0x04 | ||
16 | #define ADB_IOP_FLUSH 0x08 | ||
17 | #define ADB_IOP_RESET 0x10 | ||
18 | #define ADB_IOP_INT 0x20 | ||
19 | #define ADB_IOP_POLL 0x40 | ||
20 | #define ADB_IOP_UNINT 0x80 | ||
21 | |||
22 | #define AIF_RESET 0x00 | ||
23 | #define AIF_FLUSH 0x01 | ||
24 | #define AIF_LISTEN 0x08 | ||
25 | #define AIF_TALK 0x0C | ||
26 | |||
27 | /* Flag bits in struct adb_iopmsg */ | ||
28 | |||
29 | #define ADB_IOP_EXPLICIT 0x80 /* nonzero if explicit command */ | ||
30 | #define ADB_IOP_AUTOPOLL 0x40 /* auto/SRQ polling enabled */ | ||
31 | #define ADB_IOP_SRQ 0x04 /* SRQ detected */ | ||
32 | #define ADB_IOP_TIMEOUT 0x02 /* nonzero if timeout */ | ||
33 | |||
34 | #ifndef __ASSEMBLY__ | ||
35 | |||
36 | struct adb_iopmsg { | ||
37 | __u8 flags; /* ADB flags */ | ||
38 | __u8 count; /* no. of data bytes */ | ||
39 | __u8 cmd; /* ADB command */ | ||
40 | __u8 data[8]; /* ADB data */ | ||
41 | __u8 spare[21]; /* spare */ | ||
42 | }; | ||
43 | |||
44 | #endif /* __ASSEMBLY__ */ | ||
diff --git a/include/asm-m68k/amigahw.h b/include/asm-m68k/amigahw.h deleted file mode 100644 index 5ca5dd951a4a..000000000000 --- a/include/asm-m68k/amigahw.h +++ /dev/null | |||
@@ -1,350 +0,0 @@ | |||
1 | /* | ||
2 | ** asm-m68k/amigahw.h -- This header defines some macros and pointers for | ||
3 | ** the various Amiga custom hardware registers. | ||
4 | ** The naming conventions used here conform to those | ||
5 | ** used in the Amiga Hardware Reference Manual, 3rd Edition | ||
6 | ** | ||
7 | ** Copyright 1992 by Greg Harp | ||
8 | ** | ||
9 | ** This file is subject to the terms and conditions of the GNU General Public | ||
10 | ** License. See the file COPYING in the main directory of this archive | ||
11 | ** for more details. | ||
12 | ** | ||
13 | ** Created: 9/24/92 by Greg Harp | ||
14 | */ | ||
15 | |||
16 | #ifndef _M68K_AMIGAHW_H | ||
17 | #define _M68K_AMIGAHW_H | ||
18 | |||
19 | #include <linux/ioport.h> | ||
20 | |||
21 | /* | ||
22 | * Different Amiga models | ||
23 | */ | ||
24 | |||
25 | #define AMI_UNKNOWN (0) | ||
26 | #define AMI_500 (1) | ||
27 | #define AMI_500PLUS (2) | ||
28 | #define AMI_600 (3) | ||
29 | #define AMI_1000 (4) | ||
30 | #define AMI_1200 (5) | ||
31 | #define AMI_2000 (6) | ||
32 | #define AMI_2500 (7) | ||
33 | #define AMI_3000 (8) | ||
34 | #define AMI_3000T (9) | ||
35 | #define AMI_3000PLUS (10) | ||
36 | #define AMI_4000 (11) | ||
37 | #define AMI_4000T (12) | ||
38 | #define AMI_CDTV (13) | ||
39 | #define AMI_CD32 (14) | ||
40 | #define AMI_DRACO (15) | ||
41 | |||
42 | |||
43 | /* | ||
44 | * Chipsets | ||
45 | */ | ||
46 | |||
47 | extern unsigned long amiga_chipset; | ||
48 | |||
49 | #define CS_STONEAGE (0) | ||
50 | #define CS_OCS (1) | ||
51 | #define CS_ECS (2) | ||
52 | #define CS_AGA (3) | ||
53 | |||
54 | |||
55 | /* | ||
56 | * Miscellaneous | ||
57 | */ | ||
58 | |||
59 | extern unsigned long amiga_eclock; /* 700 kHz E Peripheral Clock */ | ||
60 | extern unsigned long amiga_colorclock; /* 3.5 MHz Color Clock */ | ||
61 | extern unsigned long amiga_chip_size; /* Chip RAM Size (bytes) */ | ||
62 | extern unsigned char amiga_vblank; /* VBLANK Frequency */ | ||
63 | |||
64 | |||
65 | #define AMIGAHW_DECLARE(name) unsigned name : 1 | ||
66 | #define AMIGAHW_SET(name) (amiga_hw_present.name = 1) | ||
67 | #define AMIGAHW_PRESENT(name) (amiga_hw_present.name) | ||
68 | |||
69 | struct amiga_hw_present { | ||
70 | /* video hardware */ | ||
71 | AMIGAHW_DECLARE(AMI_VIDEO); /* Amiga Video */ | ||
72 | AMIGAHW_DECLARE(AMI_BLITTER); /* Amiga Blitter */ | ||
73 | AMIGAHW_DECLARE(AMBER_FF); /* Amber Flicker Fixer */ | ||
74 | /* sound hardware */ | ||
75 | AMIGAHW_DECLARE(AMI_AUDIO); /* Amiga Audio */ | ||
76 | /* disk storage interfaces */ | ||
77 | AMIGAHW_DECLARE(AMI_FLOPPY); /* Amiga Floppy */ | ||
78 | AMIGAHW_DECLARE(A3000_SCSI); /* SCSI (wd33c93, A3000 alike) */ | ||
79 | AMIGAHW_DECLARE(A4000_SCSI); /* SCSI (ncr53c710, A4000T alike) */ | ||
80 | AMIGAHW_DECLARE(A1200_IDE); /* IDE (A1200 alike) */ | ||
81 | AMIGAHW_DECLARE(A4000_IDE); /* IDE (A4000 alike) */ | ||
82 | AMIGAHW_DECLARE(CD_ROM); /* CD ROM drive */ | ||
83 | /* other I/O hardware */ | ||
84 | AMIGAHW_DECLARE(AMI_KEYBOARD); /* Amiga Keyboard */ | ||
85 | AMIGAHW_DECLARE(AMI_MOUSE); /* Amiga Mouse */ | ||
86 | AMIGAHW_DECLARE(AMI_SERIAL); /* Amiga Serial */ | ||
87 | AMIGAHW_DECLARE(AMI_PARALLEL); /* Amiga Parallel */ | ||
88 | /* real time clocks */ | ||
89 | AMIGAHW_DECLARE(A2000_CLK); /* Hardware Clock (A2000 alike) */ | ||
90 | AMIGAHW_DECLARE(A3000_CLK); /* Hardware Clock (A3000 alike) */ | ||
91 | /* supporting hardware */ | ||
92 | AMIGAHW_DECLARE(CHIP_RAM); /* Chip RAM */ | ||
93 | AMIGAHW_DECLARE(PAULA); /* Paula (8364) */ | ||
94 | AMIGAHW_DECLARE(DENISE); /* Denise (8362) */ | ||
95 | AMIGAHW_DECLARE(DENISE_HR); /* Denise (8373) */ | ||
96 | AMIGAHW_DECLARE(LISA); /* Lisa (8375) */ | ||
97 | AMIGAHW_DECLARE(AGNUS_PAL); /* Normal/Fat PAL Agnus (8367/8371) */ | ||
98 | AMIGAHW_DECLARE(AGNUS_NTSC); /* Normal/Fat NTSC Agnus (8361/8370) */ | ||
99 | AMIGAHW_DECLARE(AGNUS_HR_PAL); /* Fat Hires PAL Agnus (8372) */ | ||
100 | AMIGAHW_DECLARE(AGNUS_HR_NTSC); /* Fat Hires NTSC Agnus (8372) */ | ||
101 | AMIGAHW_DECLARE(ALICE_PAL); /* PAL Alice (8374) */ | ||
102 | AMIGAHW_DECLARE(ALICE_NTSC); /* NTSC Alice (8374) */ | ||
103 | AMIGAHW_DECLARE(MAGIC_REKICK); /* A3000 Magic Hard Rekick */ | ||
104 | AMIGAHW_DECLARE(PCMCIA); /* PCMCIA Slot */ | ||
105 | AMIGAHW_DECLARE(GG2_ISA); /* GG2 Zorro2ISA Bridge */ | ||
106 | AMIGAHW_DECLARE(ZORRO); /* Zorro AutoConfig */ | ||
107 | AMIGAHW_DECLARE(ZORRO3); /* Zorro III */ | ||
108 | }; | ||
109 | |||
110 | extern struct amiga_hw_present amiga_hw_present; | ||
111 | |||
112 | struct CUSTOM { | ||
113 | unsigned short bltddat; | ||
114 | unsigned short dmaconr; | ||
115 | unsigned short vposr; | ||
116 | unsigned short vhposr; | ||
117 | unsigned short dskdatr; | ||
118 | unsigned short joy0dat; | ||
119 | unsigned short joy1dat; | ||
120 | unsigned short clxdat; | ||
121 | unsigned short adkconr; | ||
122 | unsigned short pot0dat; | ||
123 | unsigned short pot1dat; | ||
124 | unsigned short potgor; | ||
125 | unsigned short serdatr; | ||
126 | unsigned short dskbytr; | ||
127 | unsigned short intenar; | ||
128 | unsigned short intreqr; | ||
129 | unsigned char *dskptr; | ||
130 | unsigned short dsklen; | ||
131 | unsigned short dskdat; | ||
132 | unsigned short refptr; | ||
133 | unsigned short vposw; | ||
134 | unsigned short vhposw; | ||
135 | unsigned short copcon; | ||
136 | unsigned short serdat; | ||
137 | unsigned short serper; | ||
138 | unsigned short potgo; | ||
139 | unsigned short joytest; | ||
140 | unsigned short strequ; | ||
141 | unsigned short strvbl; | ||
142 | unsigned short strhor; | ||
143 | unsigned short strlong; | ||
144 | unsigned short bltcon0; | ||
145 | unsigned short bltcon1; | ||
146 | unsigned short bltafwm; | ||
147 | unsigned short bltalwm; | ||
148 | unsigned char *bltcpt; | ||
149 | unsigned char *bltbpt; | ||
150 | unsigned char *bltapt; | ||
151 | unsigned char *bltdpt; | ||
152 | unsigned short bltsize; | ||
153 | unsigned char pad2d; | ||
154 | unsigned char bltcon0l; | ||
155 | unsigned short bltsizv; | ||
156 | unsigned short bltsizh; | ||
157 | unsigned short bltcmod; | ||
158 | unsigned short bltbmod; | ||
159 | unsigned short bltamod; | ||
160 | unsigned short bltdmod; | ||
161 | unsigned short spare2[4]; | ||
162 | unsigned short bltcdat; | ||
163 | unsigned short bltbdat; | ||
164 | unsigned short bltadat; | ||
165 | unsigned short spare3[3]; | ||
166 | unsigned short deniseid; | ||
167 | unsigned short dsksync; | ||
168 | unsigned short *cop1lc; | ||
169 | unsigned short *cop2lc; | ||
170 | unsigned short copjmp1; | ||
171 | unsigned short copjmp2; | ||
172 | unsigned short copins; | ||
173 | unsigned short diwstrt; | ||
174 | unsigned short diwstop; | ||
175 | unsigned short ddfstrt; | ||
176 | unsigned short ddfstop; | ||
177 | unsigned short dmacon; | ||
178 | unsigned short clxcon; | ||
179 | unsigned short intena; | ||
180 | unsigned short intreq; | ||
181 | unsigned short adkcon; | ||
182 | struct { | ||
183 | unsigned short *audlc; | ||
184 | unsigned short audlen; | ||
185 | unsigned short audper; | ||
186 | unsigned short audvol; | ||
187 | unsigned short auddat; | ||
188 | unsigned short audspare[2]; | ||
189 | } aud[4]; | ||
190 | unsigned char *bplpt[8]; | ||
191 | unsigned short bplcon0; | ||
192 | unsigned short bplcon1; | ||
193 | unsigned short bplcon2; | ||
194 | unsigned short bplcon3; | ||
195 | unsigned short bpl1mod; | ||
196 | unsigned short bpl2mod; | ||
197 | unsigned short bplcon4; | ||
198 | unsigned short clxcon2; | ||
199 | unsigned short bpldat[8]; | ||
200 | unsigned char *sprpt[8]; | ||
201 | struct { | ||
202 | unsigned short pos; | ||
203 | unsigned short ctl; | ||
204 | unsigned short dataa; | ||
205 | unsigned short datab; | ||
206 | } spr[8]; | ||
207 | unsigned short color[32]; | ||
208 | unsigned short htotal; | ||
209 | unsigned short hsstop; | ||
210 | unsigned short hbstrt; | ||
211 | unsigned short hbstop; | ||
212 | unsigned short vtotal; | ||
213 | unsigned short vsstop; | ||
214 | unsigned short vbstrt; | ||
215 | unsigned short vbstop; | ||
216 | unsigned short sprhstrt; | ||
217 | unsigned short sprhstop; | ||
218 | unsigned short bplhstrt; | ||
219 | unsigned short bplhstop; | ||
220 | unsigned short hhposw; | ||
221 | unsigned short hhposr; | ||
222 | unsigned short beamcon0; | ||
223 | unsigned short hsstrt; | ||
224 | unsigned short vsstrt; | ||
225 | unsigned short hcenter; | ||
226 | unsigned short diwhigh; | ||
227 | unsigned short spare4[11]; | ||
228 | unsigned short fmode; | ||
229 | }; | ||
230 | |||
231 | /* | ||
232 | * DMA register bits | ||
233 | */ | ||
234 | #define DMAF_SETCLR (0x8000) | ||
235 | #define DMAF_AUD0 (0x0001) | ||
236 | #define DMAF_AUD1 (0x0002) | ||
237 | #define DMAF_AUD2 (0x0004) | ||
238 | #define DMAF_AUD3 (0x0008) | ||
239 | #define DMAF_DISK (0x0010) | ||
240 | #define DMAF_SPRITE (0x0020) | ||
241 | #define DMAF_BLITTER (0x0040) | ||
242 | #define DMAF_COPPER (0x0080) | ||
243 | #define DMAF_RASTER (0x0100) | ||
244 | #define DMAF_MASTER (0x0200) | ||
245 | #define DMAF_BLITHOG (0x0400) | ||
246 | #define DMAF_BLTNZERO (0x2000) | ||
247 | #define DMAF_BLTDONE (0x4000) | ||
248 | #define DMAF_ALL (0x01FF) | ||
249 | |||
250 | struct CIA { | ||
251 | unsigned char pra; char pad0[0xff]; | ||
252 | unsigned char prb; char pad1[0xff]; | ||
253 | unsigned char ddra; char pad2[0xff]; | ||
254 | unsigned char ddrb; char pad3[0xff]; | ||
255 | unsigned char talo; char pad4[0xff]; | ||
256 | unsigned char tahi; char pad5[0xff]; | ||
257 | unsigned char tblo; char pad6[0xff]; | ||
258 | unsigned char tbhi; char pad7[0xff]; | ||
259 | unsigned char todlo; char pad8[0xff]; | ||
260 | unsigned char todmid; char pad9[0xff]; | ||
261 | unsigned char todhi; char pada[0x1ff]; | ||
262 | unsigned char sdr; char padb[0xff]; | ||
263 | unsigned char icr; char padc[0xff]; | ||
264 | unsigned char cra; char padd[0xff]; | ||
265 | unsigned char crb; char pade[0xff]; | ||
266 | }; | ||
267 | |||
268 | #define zTwoBase (0x80000000) | ||
269 | #define ZTWO_PADDR(x) (((unsigned long)(x))-zTwoBase) | ||
270 | #define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) | ||
271 | |||
272 | #define CUSTOM_PHYSADDR (0xdff000) | ||
273 | #define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR))) | ||
274 | |||
275 | #define CIAA_PHYSADDR (0xbfe001) | ||
276 | #define CIAB_PHYSADDR (0xbfd000) | ||
277 | #define ciaa ((*(volatile struct CIA *)(zTwoBase + CIAA_PHYSADDR))) | ||
278 | #define ciab ((*(volatile struct CIA *)(zTwoBase + CIAB_PHYSADDR))) | ||
279 | |||
280 | #define CHIP_PHYSADDR (0x000000) | ||
281 | |||
282 | void amiga_chip_init (void); | ||
283 | void *amiga_chip_alloc(unsigned long size, const char *name); | ||
284 | void *amiga_chip_alloc_res(unsigned long size, struct resource *res); | ||
285 | void amiga_chip_free(void *ptr); | ||
286 | unsigned long amiga_chip_avail( void ); /*MILAN*/ | ||
287 | extern volatile unsigned short amiga_audio_min_period; | ||
288 | |||
289 | static inline void amifb_video_off(void) | ||
290 | { | ||
291 | if (amiga_chipset == CS_ECS || amiga_chipset == CS_AGA) { | ||
292 | /* program Denise/Lisa for a higher maximum play rate */ | ||
293 | amiga_custom.htotal = 113; /* 31 kHz */ | ||
294 | amiga_custom.vtotal = 223; /* 70 Hz */ | ||
295 | amiga_custom.beamcon0 = 0x4390; /* HARDDIS, VAR{BEAM,VSY,HSY,CSY}EN */ | ||
296 | /* suspend the monitor */ | ||
297 | amiga_custom.hsstrt = amiga_custom.hsstop = 116; | ||
298 | amiga_custom.vsstrt = amiga_custom.vsstop = 226; | ||
299 | amiga_audio_min_period = 57; | ||
300 | } | ||
301 | } | ||
302 | |||
303 | struct tod3000 { | ||
304 | unsigned int :28, second2:4; /* lower digit */ | ||
305 | unsigned int :28, second1:4; /* upper digit */ | ||
306 | unsigned int :28, minute2:4; /* lower digit */ | ||
307 | unsigned int :28, minute1:4; /* upper digit */ | ||
308 | unsigned int :28, hour2:4; /* lower digit */ | ||
309 | unsigned int :28, hour1:4; /* upper digit */ | ||
310 | unsigned int :28, weekday:4; | ||
311 | unsigned int :28, day2:4; /* lower digit */ | ||
312 | unsigned int :28, day1:4; /* upper digit */ | ||
313 | unsigned int :28, month2:4; /* lower digit */ | ||
314 | unsigned int :28, month1:4; /* upper digit */ | ||
315 | unsigned int :28, year2:4; /* lower digit */ | ||
316 | unsigned int :28, year1:4; /* upper digit */ | ||
317 | unsigned int :28, cntrl1:4; /* control-byte 1 */ | ||
318 | unsigned int :28, cntrl2:4; /* control-byte 2 */ | ||
319 | unsigned int :28, cntrl3:4; /* control-byte 3 */ | ||
320 | }; | ||
321 | #define TOD3000_CNTRL1_HOLD 0 | ||
322 | #define TOD3000_CNTRL1_FREE 9 | ||
323 | #define tod_3000 ((*(volatile struct tod3000 *)(zTwoBase+0xDC0000))) | ||
324 | |||
325 | struct tod2000 { | ||
326 | unsigned int :28, second2:4; /* lower digit */ | ||
327 | unsigned int :28, second1:4; /* upper digit */ | ||
328 | unsigned int :28, minute2:4; /* lower digit */ | ||
329 | unsigned int :28, minute1:4; /* upper digit */ | ||
330 | unsigned int :28, hour2:4; /* lower digit */ | ||
331 | unsigned int :28, hour1:4; /* upper digit */ | ||
332 | unsigned int :28, day2:4; /* lower digit */ | ||
333 | unsigned int :28, day1:4; /* upper digit */ | ||
334 | unsigned int :28, month2:4; /* lower digit */ | ||
335 | unsigned int :28, month1:4; /* upper digit */ | ||
336 | unsigned int :28, year2:4; /* lower digit */ | ||
337 | unsigned int :28, year1:4; /* upper digit */ | ||
338 | unsigned int :28, weekday:4; | ||
339 | unsigned int :28, cntrl1:4; /* control-byte 1 */ | ||
340 | unsigned int :28, cntrl2:4; /* control-byte 2 */ | ||
341 | unsigned int :28, cntrl3:4; /* control-byte 3 */ | ||
342 | }; | ||
343 | |||
344 | #define TOD2000_CNTRL1_HOLD (1<<0) | ||
345 | #define TOD2000_CNTRL1_BUSY (1<<1) | ||
346 | #define TOD2000_CNTRL3_24HMODE (1<<2) | ||
347 | #define TOD2000_HOUR1_PM (1<<2) | ||
348 | #define tod_2000 ((*(volatile struct tod2000 *)(zTwoBase+0xDC0000))) | ||
349 | |||
350 | #endif /* _M68K_AMIGAHW_H */ | ||
diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h deleted file mode 100644 index b1bcdb835ab9..000000000000 --- a/include/asm-m68k/amigaints.h +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* | ||
2 | ** amigaints.h -- Amiga Linux interrupt handling structs and prototypes | ||
3 | ** | ||
4 | ** Copyright 1992 by Greg Harp | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | ** Created 10/2/92 by Greg Harp | ||
11 | */ | ||
12 | |||
13 | #ifndef _ASMm68k_AMIGAINTS_H_ | ||
14 | #define _ASMm68k_AMIGAINTS_H_ | ||
15 | |||
16 | #include <asm/irq.h> | ||
17 | |||
18 | /* | ||
19 | ** Amiga Interrupt sources. | ||
20 | ** | ||
21 | */ | ||
22 | |||
23 | #define AUTO_IRQS (8) | ||
24 | #define AMI_STD_IRQS (14) | ||
25 | #define CIA_IRQS (5) | ||
26 | #define AMI_IRQS (32) /* AUTO_IRQS+AMI_STD_IRQS+2*CIA_IRQS */ | ||
27 | |||
28 | /* builtin serial port interrupts */ | ||
29 | #define IRQ_AMIGA_TBE (IRQ_USER+0) | ||
30 | #define IRQ_AMIGA_RBF (IRQ_USER+11) | ||
31 | |||
32 | /* floppy disk interrupts */ | ||
33 | #define IRQ_AMIGA_DSKBLK (IRQ_USER+1) | ||
34 | #define IRQ_AMIGA_DSKSYN (IRQ_USER+12) | ||
35 | |||
36 | /* software interrupts */ | ||
37 | #define IRQ_AMIGA_SOFT (IRQ_USER+2) | ||
38 | |||
39 | /* interrupts from external hardware */ | ||
40 | #define IRQ_AMIGA_PORTS IRQ_AUTO_2 | ||
41 | #define IRQ_AMIGA_EXTER IRQ_AUTO_6 | ||
42 | |||
43 | /* copper interrupt */ | ||
44 | #define IRQ_AMIGA_COPPER (IRQ_USER+4) | ||
45 | |||
46 | /* vertical blanking interrupt */ | ||
47 | #define IRQ_AMIGA_VERTB (IRQ_USER+5) | ||
48 | |||
49 | /* Blitter done interrupt */ | ||
50 | #define IRQ_AMIGA_BLIT (IRQ_USER+6) | ||
51 | |||
52 | /* Audio interrupts */ | ||
53 | #define IRQ_AMIGA_AUD0 (IRQ_USER+7) | ||
54 | #define IRQ_AMIGA_AUD1 (IRQ_USER+8) | ||
55 | #define IRQ_AMIGA_AUD2 (IRQ_USER+9) | ||
56 | #define IRQ_AMIGA_AUD3 (IRQ_USER+10) | ||
57 | |||
58 | /* CIA interrupt sources */ | ||
59 | #define IRQ_AMIGA_CIAA (IRQ_USER+14) | ||
60 | #define IRQ_AMIGA_CIAA_TA (IRQ_USER+14) | ||
61 | #define IRQ_AMIGA_CIAA_TB (IRQ_USER+15) | ||
62 | #define IRQ_AMIGA_CIAA_ALRM (IRQ_USER+16) | ||
63 | #define IRQ_AMIGA_CIAA_SP (IRQ_USER+17) | ||
64 | #define IRQ_AMIGA_CIAA_FLG (IRQ_USER+18) | ||
65 | #define IRQ_AMIGA_CIAB (IRQ_USER+19) | ||
66 | #define IRQ_AMIGA_CIAB_TA (IRQ_USER+19) | ||
67 | #define IRQ_AMIGA_CIAB_TB (IRQ_USER+20) | ||
68 | #define IRQ_AMIGA_CIAB_ALRM (IRQ_USER+21) | ||
69 | #define IRQ_AMIGA_CIAB_SP (IRQ_USER+22) | ||
70 | #define IRQ_AMIGA_CIAB_FLG (IRQ_USER+23) | ||
71 | |||
72 | |||
73 | /* INTREQR masks */ | ||
74 | #define IF_SETCLR 0x8000 /* set/clr bit */ | ||
75 | #define IF_INTEN 0x4000 /* master interrupt bit in INT* registers */ | ||
76 | #define IF_EXTER 0x2000 /* external level 6 and CIA B interrupt */ | ||
77 | #define IF_DSKSYN 0x1000 /* disk sync interrupt */ | ||
78 | #define IF_RBF 0x0800 /* serial receive buffer full interrupt */ | ||
79 | #define IF_AUD3 0x0400 /* audio channel 3 done interrupt */ | ||
80 | #define IF_AUD2 0x0200 /* audio channel 2 done interrupt */ | ||
81 | #define IF_AUD1 0x0100 /* audio channel 1 done interrupt */ | ||
82 | #define IF_AUD0 0x0080 /* audio channel 0 done interrupt */ | ||
83 | #define IF_BLIT 0x0040 /* blitter done interrupt */ | ||
84 | #define IF_VERTB 0x0020 /* vertical blanking interrupt */ | ||
85 | #define IF_COPER 0x0010 /* copper interrupt */ | ||
86 | #define IF_PORTS 0x0008 /* external level 2 and CIA A interrupt */ | ||
87 | #define IF_SOFT 0x0004 /* software initiated interrupt */ | ||
88 | #define IF_DSKBLK 0x0002 /* diskblock DMA finished */ | ||
89 | #define IF_TBE 0x0001 /* serial transmit buffer empty interrupt */ | ||
90 | |||
91 | /* CIA interrupt control register bits */ | ||
92 | |||
93 | #define CIA_ICR_TA 0x01 | ||
94 | #define CIA_ICR_TB 0x02 | ||
95 | #define CIA_ICR_ALRM 0x04 | ||
96 | #define CIA_ICR_SP 0x08 | ||
97 | #define CIA_ICR_FLG 0x10 | ||
98 | #define CIA_ICR_ALL 0x1f | ||
99 | #define CIA_ICR_SETCLR 0x80 | ||
100 | |||
101 | extern void amiga_init_IRQ(void); | ||
102 | |||
103 | /* to access the interrupt control registers of CIA's use only | ||
104 | ** these functions, they behave exactly like the amiga os routines | ||
105 | */ | ||
106 | |||
107 | extern struct ciabase ciaa_base, ciab_base; | ||
108 | |||
109 | extern void cia_init_IRQ(struct ciabase *base); | ||
110 | extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask); | ||
111 | extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask); | ||
112 | |||
113 | #endif /* asm-m68k/amigaints.h */ | ||
diff --git a/include/asm-m68k/amigayle.h b/include/asm-m68k/amigayle.h deleted file mode 100644 index bb5a6aa329f3..000000000000 --- a/include/asm-m68k/amigayle.h +++ /dev/null | |||
@@ -1,107 +0,0 @@ | |||
1 | /* | ||
2 | ** asm-m68k/amigayle.h -- This header defines the registers of the gayle chip | ||
3 | ** found on the Amiga 1200 | ||
4 | ** This information was found by disassembling card.resource, | ||
5 | ** so the definitions may not be 100% correct | ||
6 | ** anyone has an official doc ? | ||
7 | ** | ||
8 | ** Copyright 1997 by Alain Malek | ||
9 | ** | ||
10 | ** This file is subject to the terms and conditions of the GNU General Public | ||
11 | ** License. See the file COPYING in the main directory of this archive | ||
12 | ** for more details. | ||
13 | ** | ||
14 | ** Created: 11/28/97 by Alain Malek | ||
15 | */ | ||
16 | |||
17 | #ifndef _M68K_AMIGAYLE_H_ | ||
18 | #define _M68K_AMIGAYLE_H_ | ||
19 | |||
20 | #include <linux/types.h> | ||
21 | #include <asm/amigahw.h> | ||
22 | |||
23 | /* memory layout */ | ||
24 | |||
25 | #define GAYLE_RAM (0x600000+zTwoBase) | ||
26 | #define GAYLE_RAMSIZE (0x400000) | ||
27 | #define GAYLE_ATTRIBUTE (0xa00000+zTwoBase) | ||
28 | #define GAYLE_ATTRIBUTESIZE (0x020000) | ||
29 | #define GAYLE_IO (0xa20000+zTwoBase) /* 16bit and even 8bit registers */ | ||
30 | #define GAYLE_IOSIZE (0x010000) | ||
31 | #define GAYLE_IO_8BITODD (0xa30000+zTwoBase) /* odd 8bit registers */ | ||
32 | |||
33 | /* offset for accessing odd IO registers */ | ||
34 | #define GAYLE_ODD (GAYLE_IO_8BITODD-GAYLE_IO-1) | ||
35 | |||
36 | /* GAYLE registers */ | ||
37 | |||
38 | struct GAYLE { | ||
39 | u_char cardstatus; | ||
40 | u_char pad0[0x1000-1]; | ||
41 | |||
42 | u_char intreq; | ||
43 | u_char pad1[0x1000-1]; | ||
44 | |||
45 | u_char inten; | ||
46 | u_char pad2[0x1000-1]; | ||
47 | |||
48 | u_char config; | ||
49 | u_char pad3[0x1000-1]; | ||
50 | }; | ||
51 | |||
52 | #define GAYLE_ADDRESS (0xda8000) /* gayle main registers base address */ | ||
53 | |||
54 | #define GAYLE_RESET (0xa40000) /* write 0x00 to start reset, | ||
55 | read 1 byte to stop reset */ | ||
56 | |||
57 | #define gayle (*(volatile struct GAYLE *)(zTwoBase+GAYLE_ADDRESS)) | ||
58 | #define gayle_reset (*(volatile u_char *)(zTwoBase+GAYLE_RESET)) | ||
59 | |||
60 | #define gayle_attribute ((volatile u_char *)(GAYLE_ATTRIBUTE)) | ||
61 | |||
62 | #if 0 | ||
63 | #define gayle_inb(a) readb( GAYLE_IO+(a)+(((a)&1)*GAYLE_ODD) ) | ||
64 | #define gayle_outb(v,a) writeb( v, GAYLE_IO+(a)+(((a)&1)*GAYLE_ODD) ) | ||
65 | |||
66 | #define gayle_inw(a) readw( GAYLE_IO+(a) ) | ||
67 | #define gayle_outw(v,a) writew( v, GAYLE_IO+(a) ) | ||
68 | #endif | ||
69 | |||
70 | /* GAYLE_CARDSTATUS bit def */ | ||
71 | |||
72 | #define GAYLE_CS_CCDET 0x40 /* credit card detect */ | ||
73 | #define GAYLE_CS_BVD1 0x20 /* battery voltage detect 1 */ | ||
74 | #define GAYLE_CS_SC 0x20 /* credit card status change */ | ||
75 | #define GAYLE_CS_BVD2 0x10 /* battery voltage detect 2 */ | ||
76 | #define GAYLE_CS_DA 0x10 /* digital audio */ | ||
77 | #define GAYLE_CS_WR 0x08 /* write enable (1 == enabled) */ | ||
78 | #define GAYLE_CS_BSY 0x04 /* credit card busy */ | ||
79 | #define GAYLE_CS_IRQ 0x04 /* interrupt request */ | ||
80 | |||
81 | /* GAYLE_IRQ bit def */ | ||
82 | |||
83 | #define GAYLE_IRQ_IDE 0x80 | ||
84 | #define GAYLE_IRQ_CCDET 0x40 | ||
85 | #define GAYLE_IRQ_BVD1 0x20 | ||
86 | #define GAYLE_IRQ_SC 0x20 | ||
87 | #define GAYLE_IRQ_BVD2 0x10 | ||
88 | #define GAYLE_IRQ_DA 0x10 | ||
89 | #define GAYLE_IRQ_WR 0x08 | ||
90 | #define GAYLE_IRQ_BSY 0x04 | ||
91 | #define GAYLE_IRQ_IRQ 0x04 | ||
92 | #define GAYLE_IRQ_IDEACK1 0x02 | ||
93 | #define GAYLE_IRQ_IDEACK0 0x01 | ||
94 | |||
95 | /* GAYLE_CONFIG bit def | ||
96 | (bit 0-1 for program voltage, bit 2-3 for access speed */ | ||
97 | |||
98 | #define GAYLE_CFG_0V 0x00 | ||
99 | #define GAYLE_CFG_5V 0x01 | ||
100 | #define GAYLE_CFG_12V 0x02 | ||
101 | |||
102 | #define GAYLE_CFG_100NS 0x08 | ||
103 | #define GAYLE_CFG_150NS 0x04 | ||
104 | #define GAYLE_CFG_250NS 0x00 | ||
105 | #define GAYLE_CFG_720NS 0x0c | ||
106 | |||
107 | #endif /* asm-m68k/amigayle.h */ | ||
diff --git a/include/asm-m68k/amipcmcia.h b/include/asm-m68k/amipcmcia.h deleted file mode 100644 index 6f1ec1887d82..000000000000 --- a/include/asm-m68k/amipcmcia.h +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | /* | ||
2 | ** asm-m68k/pcmcia.h -- Amiga Linux PCMCIA Definitions | ||
3 | ** | ||
4 | ** Copyright 1997 by Alain Malek | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | ** Created: 12/10/97 by Alain Malek | ||
11 | */ | ||
12 | |||
13 | #ifndef __AMIGA_PCMCIA_H__ | ||
14 | #define __AMIGA_PCMCIA_H__ | ||
15 | |||
16 | #include <asm/amigayle.h> | ||
17 | |||
18 | /* prototypes */ | ||
19 | |||
20 | void pcmcia_reset(void); | ||
21 | int pcmcia_copy_tuple(unsigned char tuple_id, void *tuple, int max_len); | ||
22 | void pcmcia_program_voltage(int voltage); | ||
23 | void pcmcia_access_speed(int speed); | ||
24 | void pcmcia_write_enable(void); | ||
25 | void pcmcia_write_disable(void); | ||
26 | |||
27 | static inline u_char pcmcia_read_status(void) | ||
28 | { | ||
29 | return (gayle.cardstatus & 0x7c); | ||
30 | } | ||
31 | |||
32 | static inline u_char pcmcia_get_intreq(void) | ||
33 | { | ||
34 | return (gayle.intreq); | ||
35 | } | ||
36 | |||
37 | static inline void pcmcia_ack_int(u_char intreq) | ||
38 | { | ||
39 | gayle.intreq = 0xf8; | ||
40 | } | ||
41 | |||
42 | static inline void pcmcia_enable_irq(void) | ||
43 | { | ||
44 | gayle.inten |= GAYLE_IRQ_IRQ; | ||
45 | } | ||
46 | |||
47 | static inline void pcmcia_disable_irq(void) | ||
48 | { | ||
49 | gayle.inten &= ~GAYLE_IRQ_IRQ; | ||
50 | } | ||
51 | |||
52 | #define PCMCIA_INSERTED (gayle.cardstatus & GAYLE_CS_CCDET) | ||
53 | |||
54 | /* valid voltages for pcmcia_ProgramVoltage */ | ||
55 | |||
56 | #define PCMCIA_0V 0 | ||
57 | #define PCMCIA_5V 5 | ||
58 | #define PCMCIA_12V 12 | ||
59 | |||
60 | /* valid speeds for pcmcia_AccessSpeed */ | ||
61 | |||
62 | #define PCMCIA_SPEED_100NS 100 | ||
63 | #define PCMCIA_SPEED_150NS 150 | ||
64 | #define PCMCIA_SPEED_250NS 250 | ||
65 | #define PCMCIA_SPEED_720NS 720 | ||
66 | |||
67 | /* PCMCIA Tuple codes */ | ||
68 | |||
69 | #define CISTPL_NULL 0x00 | ||
70 | #define CISTPL_DEVICE 0x01 | ||
71 | #define CISTPL_LONGLINK_CB 0x02 | ||
72 | #define CISTPL_CONFIG_CB 0x04 | ||
73 | #define CISTPL_CFTABLE_ENTRY_CB 0x05 | ||
74 | #define CISTPL_LONGLINK_MFC 0x06 | ||
75 | #define CISTPL_BAR 0x07 | ||
76 | #define CISTPL_CHECKSUM 0x10 | ||
77 | #define CISTPL_LONGLINK_A 0x11 | ||
78 | #define CISTPL_LONGLINK_C 0x12 | ||
79 | #define CISTPL_LINKTARGET 0x13 | ||
80 | #define CISTPL_NO_LINK 0x14 | ||
81 | #define CISTPL_VERS_1 0x15 | ||
82 | #define CISTPL_ALTSTR 0x16 | ||
83 | #define CISTPL_DEVICE_A 0x17 | ||
84 | #define CISTPL_JEDEC_C 0x18 | ||
85 | #define CISTPL_JEDEC_A 0x19 | ||
86 | #define CISTPL_CONFIG 0x1a | ||
87 | #define CISTPL_CFTABLE_ENTRY 0x1b | ||
88 | #define CISTPL_DEVICE_OC 0x1c | ||
89 | #define CISTPL_DEVICE_OA 0x1d | ||
90 | #define CISTPL_DEVICE_GEO 0x1e | ||
91 | #define CISTPL_DEVICE_GEO_A 0x1f | ||
92 | #define CISTPL_MANFID 0x20 | ||
93 | #define CISTPL_FUNCID 0x21 | ||
94 | #define CISTPL_FUNCE 0x22 | ||
95 | #define CISTPL_SWIL 0x23 | ||
96 | #define CISTPL_END 0xff | ||
97 | |||
98 | /* FUNCID */ | ||
99 | |||
100 | #define CISTPL_FUNCID_MULTI 0x00 | ||
101 | #define CISTPL_FUNCID_MEMORY 0x01 | ||
102 | #define CISTPL_FUNCID_SERIAL 0x02 | ||
103 | #define CISTPL_FUNCID_PARALLEL 0x03 | ||
104 | #define CISTPL_FUNCID_FIXED 0x04 | ||
105 | #define CISTPL_FUNCID_VIDEO 0x05 | ||
106 | #define CISTPL_FUNCID_NETWORK 0x06 | ||
107 | #define CISTPL_FUNCID_AIMS 0x07 | ||
108 | #define CISTPL_FUNCID_SCSI 0x08 | ||
109 | |||
110 | #endif | ||
diff --git a/include/asm-m68k/apollodma.h b/include/asm-m68k/apollodma.h deleted file mode 100644 index 954adc851adb..000000000000 --- a/include/asm-m68k/apollodma.h +++ /dev/null | |||
@@ -1,248 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm/dma.h: Defines for using and allocating dma channels. | ||
3 | * Written by Hennus Bergman, 1992. | ||
4 | * High DMA channel support & info by Hannu Savolainen | ||
5 | * and John Boyd, Nov. 1992. | ||
6 | */ | ||
7 | |||
8 | #ifndef _ASM_APOLLO_DMA_H | ||
9 | #define _ASM_APOLLO_DMA_H | ||
10 | |||
11 | #include <asm/apollohw.h> /* need byte IO */ | ||
12 | #include <linux/spinlock.h> /* And spinlocks */ | ||
13 | #include <linux/delay.h> | ||
14 | |||
15 | |||
16 | #define dma_outb(val,addr) (*((volatile unsigned char *)(addr+IO_BASE)) = (val)) | ||
17 | #define dma_inb(addr) (*((volatile unsigned char *)(addr+IO_BASE))) | ||
18 | |||
19 | /* | ||
20 | * NOTES about DMA transfers: | ||
21 | * | ||
22 | * controller 1: channels 0-3, byte operations, ports 00-1F | ||
23 | * controller 2: channels 4-7, word operations, ports C0-DF | ||
24 | * | ||
25 | * - ALL registers are 8 bits only, regardless of transfer size | ||
26 | * - channel 4 is not used - cascades 1 into 2. | ||
27 | * - channels 0-3 are byte - addresses/counts are for physical bytes | ||
28 | * - channels 5-7 are word - addresses/counts are for physical words | ||
29 | * - transfers must not cross physical 64K (0-3) or 128K (5-7) boundaries | ||
30 | * - transfer count loaded to registers is 1 less than actual count | ||
31 | * - controller 2 offsets are all even (2x offsets for controller 1) | ||
32 | * - page registers for 5-7 don't use data bit 0, represent 128K pages | ||
33 | * - page registers for 0-3 use bit 0, represent 64K pages | ||
34 | * | ||
35 | * DMA transfers are limited to the lower 16MB of _physical_ memory. | ||
36 | * Note that addresses loaded into registers must be _physical_ addresses, | ||
37 | * not logical addresses (which may differ if paging is active). | ||
38 | * | ||
39 | * Address mapping for channels 0-3: | ||
40 | * | ||
41 | * A23 ... A16 A15 ... A8 A7 ... A0 (Physical addresses) | ||
42 | * | ... | | ... | | ... | | ||
43 | * | ... | | ... | | ... | | ||
44 | * | ... | | ... | | ... | | ||
45 | * P7 ... P0 A7 ... A0 A7 ... A0 | ||
46 | * | Page | Addr MSB | Addr LSB | (DMA registers) | ||
47 | * | ||
48 | * Address mapping for channels 5-7: | ||
49 | * | ||
50 | * A23 ... A17 A16 A15 ... A9 A8 A7 ... A1 A0 (Physical addresses) | ||
51 | * | ... | \ \ ... \ \ \ ... \ \ | ||
52 | * | ... | \ \ ... \ \ \ ... \ (not used) | ||
53 | * | ... | \ \ ... \ \ \ ... \ | ||
54 | * P7 ... P1 (0) A7 A6 ... A0 A7 A6 ... A0 | ||
55 | * | Page | Addr MSB | Addr LSB | (DMA registers) | ||
56 | * | ||
57 | * Again, channels 5-7 transfer _physical_ words (16 bits), so addresses | ||
58 | * and counts _must_ be word-aligned (the lowest address bit is _ignored_ at | ||
59 | * the hardware level, so odd-byte transfers aren't possible). | ||
60 | * | ||
61 | * Transfer count (_not # bytes_) is limited to 64K, represented as actual | ||
62 | * count - 1 : 64K => 0xFFFF, 1 => 0x0000. Thus, count is always 1 or more, | ||
63 | * and up to 128K bytes may be transferred on channels 5-7 in one operation. | ||
64 | * | ||
65 | */ | ||
66 | |||
67 | #define MAX_DMA_CHANNELS 8 | ||
68 | |||
69 | /* The maximum address that we can perform a DMA transfer to on this platform */#define MAX_DMA_ADDRESS (PAGE_OFFSET+0x1000000) | ||
70 | |||
71 | /* 8237 DMA controllers */ | ||
72 | #define IO_DMA1_BASE 0x10C00 /* 8 bit slave DMA, channels 0..3 */ | ||
73 | #define IO_DMA2_BASE 0x10D00 /* 16 bit master DMA, ch 4(=slave input)..7 */ | ||
74 | |||
75 | /* DMA controller registers */ | ||
76 | #define DMA1_CMD_REG (IO_DMA1_BASE+0x08) /* command register (w) */ | ||
77 | #define DMA1_STAT_REG (IO_DMA1_BASE+0x08) /* status register (r) */ | ||
78 | #define DMA1_REQ_REG (IO_DMA1_BASE+0x09) /* request register (w) */ | ||
79 | #define DMA1_MASK_REG (IO_DMA1_BASE+0x0A) /* single-channel mask (w) */ | ||
80 | #define DMA1_MODE_REG (IO_DMA1_BASE+0x0B) /* mode register (w) */ | ||
81 | #define DMA1_CLEAR_FF_REG (IO_DMA1_BASE+0x0C) /* clear pointer flip-flop (w) */ | ||
82 | #define DMA1_TEMP_REG (IO_DMA1_BASE+0x0D) /* Temporary Register (r) */ | ||
83 | #define DMA1_RESET_REG (IO_DMA1_BASE+0x0D) /* Master Clear (w) */ | ||
84 | #define DMA1_CLR_MASK_REG (IO_DMA1_BASE+0x0E) /* Clear Mask */ | ||
85 | #define DMA1_MASK_ALL_REG (IO_DMA1_BASE+0x0F) /* all-channels mask (w) */ | ||
86 | |||
87 | #define DMA2_CMD_REG (IO_DMA2_BASE+0x10) /* command register (w) */ | ||
88 | #define DMA2_STAT_REG (IO_DMA2_BASE+0x10) /* status register (r) */ | ||
89 | #define DMA2_REQ_REG (IO_DMA2_BASE+0x12) /* request register (w) */ | ||
90 | #define DMA2_MASK_REG (IO_DMA2_BASE+0x14) /* single-channel mask (w) */ | ||
91 | #define DMA2_MODE_REG (IO_DMA2_BASE+0x16) /* mode register (w) */ | ||
92 | #define DMA2_CLEAR_FF_REG (IO_DMA2_BASE+0x18) /* clear pointer flip-flop (w) */ | ||
93 | #define DMA2_TEMP_REG (IO_DMA2_BASE+0x1A) /* Temporary Register (r) */ | ||
94 | #define DMA2_RESET_REG (IO_DMA2_BASE+0x1A) /* Master Clear (w) */ | ||
95 | #define DMA2_CLR_MASK_REG (IO_DMA2_BASE+0x1C) /* Clear Mask */ | ||
96 | #define DMA2_MASK_ALL_REG (IO_DMA2_BASE+0x1E) /* all-channels mask (w) */ | ||
97 | |||
98 | #define DMA_ADDR_0 (IO_DMA1_BASE+0x00) /* DMA address registers */ | ||
99 | #define DMA_ADDR_1 (IO_DMA1_BASE+0x02) | ||
100 | #define DMA_ADDR_2 (IO_DMA1_BASE+0x04) | ||
101 | #define DMA_ADDR_3 (IO_DMA1_BASE+0x06) | ||
102 | #define DMA_ADDR_4 (IO_DMA2_BASE+0x00) | ||
103 | #define DMA_ADDR_5 (IO_DMA2_BASE+0x04) | ||
104 | #define DMA_ADDR_6 (IO_DMA2_BASE+0x08) | ||
105 | #define DMA_ADDR_7 (IO_DMA2_BASE+0x0C) | ||
106 | |||
107 | #define DMA_CNT_0 (IO_DMA1_BASE+0x01) /* DMA count registers */ | ||
108 | #define DMA_CNT_1 (IO_DMA1_BASE+0x03) | ||
109 | #define DMA_CNT_2 (IO_DMA1_BASE+0x05) | ||
110 | #define DMA_CNT_3 (IO_DMA1_BASE+0x07) | ||
111 | #define DMA_CNT_4 (IO_DMA2_BASE+0x02) | ||
112 | #define DMA_CNT_5 (IO_DMA2_BASE+0x06) | ||
113 | #define DMA_CNT_6 (IO_DMA2_BASE+0x0A) | ||
114 | #define DMA_CNT_7 (IO_DMA2_BASE+0x0E) | ||
115 | |||
116 | #define DMA_MODE_READ 0x44 /* I/O to memory, no autoinit, increment, single mode */ | ||
117 | #define DMA_MODE_WRITE 0x48 /* memory to I/O, no autoinit, increment, single mode */ | ||
118 | #define DMA_MODE_CASCADE 0xC0 /* pass thru DREQ->HRQ, DACK<-HLDA only */ | ||
119 | |||
120 | #define DMA_AUTOINIT 0x10 | ||
121 | |||
122 | #define DMA_8BIT 0 | ||
123 | #define DMA_16BIT 1 | ||
124 | #define DMA_BUSMASTER 2 | ||
125 | |||
126 | extern spinlock_t dma_spin_lock; | ||
127 | |||
128 | static __inline__ unsigned long claim_dma_lock(void) | ||
129 | { | ||
130 | unsigned long flags; | ||
131 | spin_lock_irqsave(&dma_spin_lock, flags); | ||
132 | return flags; | ||
133 | } | ||
134 | |||
135 | static __inline__ void release_dma_lock(unsigned long flags) | ||
136 | { | ||
137 | spin_unlock_irqrestore(&dma_spin_lock, flags); | ||
138 | } | ||
139 | |||
140 | /* enable/disable a specific DMA channel */ | ||
141 | static __inline__ void enable_dma(unsigned int dmanr) | ||
142 | { | ||
143 | if (dmanr<=3) | ||
144 | dma_outb(dmanr, DMA1_MASK_REG); | ||
145 | else | ||
146 | dma_outb(dmanr & 3, DMA2_MASK_REG); | ||
147 | } | ||
148 | |||
149 | static __inline__ void disable_dma(unsigned int dmanr) | ||
150 | { | ||
151 | if (dmanr<=3) | ||
152 | dma_outb(dmanr | 4, DMA1_MASK_REG); | ||
153 | else | ||
154 | dma_outb((dmanr & 3) | 4, DMA2_MASK_REG); | ||
155 | } | ||
156 | |||
157 | /* Clear the 'DMA Pointer Flip Flop'. | ||
158 | * Write 0 for LSB/MSB, 1 for MSB/LSB access. | ||
159 | * Use this once to initialize the FF to a known state. | ||
160 | * After that, keep track of it. :-) | ||
161 | * --- In order to do that, the DMA routines below should --- | ||
162 | * --- only be used while holding the DMA lock ! --- | ||
163 | */ | ||
164 | static __inline__ void clear_dma_ff(unsigned int dmanr) | ||
165 | { | ||
166 | if (dmanr<=3) | ||
167 | dma_outb(0, DMA1_CLEAR_FF_REG); | ||
168 | else | ||
169 | dma_outb(0, DMA2_CLEAR_FF_REG); | ||
170 | } | ||
171 | |||
172 | /* set mode (above) for a specific DMA channel */ | ||
173 | static __inline__ void set_dma_mode(unsigned int dmanr, char mode) | ||
174 | { | ||
175 | if (dmanr<=3) | ||
176 | dma_outb(mode | dmanr, DMA1_MODE_REG); | ||
177 | else | ||
178 | dma_outb(mode | (dmanr&3), DMA2_MODE_REG); | ||
179 | } | ||
180 | |||
181 | /* Set transfer address & page bits for specific DMA channel. | ||
182 | * Assumes dma flipflop is clear. | ||
183 | */ | ||
184 | static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) | ||
185 | { | ||
186 | if (dmanr <= 3) { | ||
187 | dma_outb( a & 0xff, ((dmanr&3)<<1) + IO_DMA1_BASE ); | ||
188 | dma_outb( (a>>8) & 0xff, ((dmanr&3)<<1) + IO_DMA1_BASE ); | ||
189 | } else { | ||
190 | dma_outb( (a>>1) & 0xff, ((dmanr&3)<<2) + IO_DMA2_BASE ); | ||
191 | dma_outb( (a>>9) & 0xff, ((dmanr&3)<<2) + IO_DMA2_BASE ); | ||
192 | } | ||
193 | } | ||
194 | |||
195 | |||
196 | /* Set transfer size (max 64k for DMA1..3, 128k for DMA5..7) for | ||
197 | * a specific DMA channel. | ||
198 | * You must ensure the parameters are valid. | ||
199 | * NOTE: from a manual: "the number of transfers is one more | ||
200 | * than the initial word count"! This is taken into account. | ||
201 | * Assumes dma flip-flop is clear. | ||
202 | * NOTE 2: "count" represents _bytes_ and must be even for channels 5-7. | ||
203 | */ | ||
204 | static __inline__ void set_dma_count(unsigned int dmanr, unsigned int count) | ||
205 | { | ||
206 | count--; | ||
207 | if (dmanr <= 3) { | ||
208 | dma_outb( count & 0xff, ((dmanr&3)<<1) + 1 + IO_DMA1_BASE ); | ||
209 | dma_outb( (count>>8) & 0xff, ((dmanr&3)<<1) + 1 + IO_DMA1_BASE ); | ||
210 | } else { | ||
211 | dma_outb( (count>>1) & 0xff, ((dmanr&3)<<2) + 2 + IO_DMA2_BASE ); | ||
212 | dma_outb( (count>>9) & 0xff, ((dmanr&3)<<2) + 2 + IO_DMA2_BASE ); | ||
213 | } | ||
214 | } | ||
215 | |||
216 | |||
217 | /* Get DMA residue count. After a DMA transfer, this | ||
218 | * should return zero. Reading this while a DMA transfer is | ||
219 | * still in progress will return unpredictable results. | ||
220 | * If called before the channel has been used, it may return 1. | ||
221 | * Otherwise, it returns the number of _bytes_ left to transfer. | ||
222 | * | ||
223 | * Assumes DMA flip-flop is clear. | ||
224 | */ | ||
225 | static __inline__ int get_dma_residue(unsigned int dmanr) | ||
226 | { | ||
227 | unsigned int io_port = (dmanr<=3)? ((dmanr&3)<<1) + 1 + IO_DMA1_BASE | ||
228 | : ((dmanr&3)<<2) + 2 + IO_DMA2_BASE; | ||
229 | |||
230 | /* using short to get 16-bit wrap around */ | ||
231 | unsigned short count; | ||
232 | |||
233 | count = 1 + dma_inb(io_port); | ||
234 | count += dma_inb(io_port) << 8; | ||
235 | |||
236 | return (dmanr<=3)? count : (count<<1); | ||
237 | } | ||
238 | |||
239 | |||
240 | /* These are in kernel/dma.c: */ | ||
241 | extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ | ||
242 | extern void free_dma(unsigned int dmanr); /* release it again */ | ||
243 | |||
244 | /* These are in arch/m68k/apollo/dma.c: */ | ||
245 | extern unsigned short dma_map_page(unsigned long phys_addr,int count,int type); | ||
246 | extern void dma_unmap_page(unsigned short dma_addr); | ||
247 | |||
248 | #endif /* _ASM_APOLLO_DMA_H */ | ||
diff --git a/include/asm-m68k/apollohw.h b/include/asm-m68k/apollohw.h deleted file mode 100644 index a1373b9aa281..000000000000 --- a/include/asm-m68k/apollohw.h +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | /* apollohw.h : some structures to access apollo HW */ | ||
2 | |||
3 | #ifndef _ASMm68k_APOLLOHW_H_ | ||
4 | #define _ASMm68k_APOLLOHW_H_ | ||
5 | |||
6 | #include <linux/types.h> | ||
7 | |||
8 | /* | ||
9 | apollo models | ||
10 | */ | ||
11 | |||
12 | extern u_long apollo_model; | ||
13 | |||
14 | #define APOLLO_UNKNOWN (0) | ||
15 | #define APOLLO_DN3000 (1) | ||
16 | #define APOLLO_DN3010 (2) | ||
17 | #define APOLLO_DN3500 (3) | ||
18 | #define APOLLO_DN4000 (4) | ||
19 | #define APOLLO_DN4500 (5) | ||
20 | |||
21 | /* | ||
22 | see scn2681 data sheet for more info. | ||
23 | member names are read_write. | ||
24 | */ | ||
25 | |||
26 | #define DECLARE_2681_FIELD(x) unsigned char x; unsigned char dummy##x | ||
27 | |||
28 | struct SCN2681 { | ||
29 | |||
30 | DECLARE_2681_FIELD(mra); | ||
31 | DECLARE_2681_FIELD(sra_csra); | ||
32 | DECLARE_2681_FIELD(BRGtest_cra); | ||
33 | DECLARE_2681_FIELD(rhra_thra); | ||
34 | DECLARE_2681_FIELD(ipcr_acr); | ||
35 | DECLARE_2681_FIELD(isr_imr); | ||
36 | DECLARE_2681_FIELD(ctu_ctur); | ||
37 | DECLARE_2681_FIELD(ctl_ctlr); | ||
38 | DECLARE_2681_FIELD(mrb); | ||
39 | DECLARE_2681_FIELD(srb_csrb); | ||
40 | DECLARE_2681_FIELD(tst_crb); | ||
41 | DECLARE_2681_FIELD(rhrb_thrb); | ||
42 | DECLARE_2681_FIELD(reserved); | ||
43 | DECLARE_2681_FIELD(ip_opcr); | ||
44 | DECLARE_2681_FIELD(startCnt_setOutBit); | ||
45 | DECLARE_2681_FIELD(stopCnt_resetOutBit); | ||
46 | |||
47 | }; | ||
48 | |||
49 | #if 0 | ||
50 | struct mc146818 { | ||
51 | |||
52 | unsigned int second1:4, second2:4, alarm_second1:4, alarm_second2:4, | ||
53 | minute1:4, minute2:4, alarm_minute1:4, alarm_minute2:4; | ||
54 | unsigned int hours1:4, hours2:4, alarm_hours1:4, alarm_hours2:4, | ||
55 | day_of_week1:4, day_of_week2:4, day_of_month1:4, day_of_month2:4; | ||
56 | unsigned int month1:4, month2:4, year1:4, year2:4, :16; | ||
57 | |||
58 | }; | ||
59 | #endif | ||
60 | |||
61 | struct mc146818 { | ||
62 | unsigned char second, alarm_second; | ||
63 | unsigned char minute, alarm_minute; | ||
64 | unsigned char hours, alarm_hours; | ||
65 | unsigned char day_of_week, day_of_month; | ||
66 | unsigned char month, year; | ||
67 | }; | ||
68 | |||
69 | |||
70 | #define IO_BASE 0x80000000 | ||
71 | |||
72 | extern u_long sio01_physaddr; | ||
73 | extern u_long sio23_physaddr; | ||
74 | extern u_long rtc_physaddr; | ||
75 | extern u_long pica_physaddr; | ||
76 | extern u_long picb_physaddr; | ||
77 | extern u_long cpuctrl_physaddr; | ||
78 | extern u_long timer_physaddr; | ||
79 | |||
80 | #define SAU7_SIO01_PHYSADDR 0x10400 | ||
81 | #define SAU7_SIO23_PHYSADDR 0x10500 | ||
82 | #define SAU7_RTC_PHYSADDR 0x10900 | ||
83 | #define SAU7_PICA 0x11000 | ||
84 | #define SAU7_PICB 0x11100 | ||
85 | #define SAU7_CPUCTRL 0x10100 | ||
86 | #define SAU7_TIMER 0x010800 | ||
87 | |||
88 | #define SAU8_SIO01_PHYSADDR 0x8400 | ||
89 | #define SAU8_RTC_PHYSADDR 0x8900 | ||
90 | #define SAU8_PICA 0x9400 | ||
91 | #define SAU8_PICB 0x9500 | ||
92 | #define SAU8_CPUCTRL 0x8100 | ||
93 | #define SAU8_TIMER 0x8800 | ||
94 | |||
95 | #define sio01 ((*(volatile struct SCN2681 *)(IO_BASE + sio01_physaddr))) | ||
96 | #define sio23 ((*(volatile struct SCN2681 *)(IO_BASE + sio23_physaddr))) | ||
97 | #define rtc (((volatile struct mc146818 *)(IO_BASE + rtc_physaddr))) | ||
98 | #define cpuctrl (*(volatile unsigned int *)(IO_BASE + cpuctrl_physaddr)) | ||
99 | #define pica (IO_BASE + pica_physaddr) | ||
100 | #define picb (IO_BASE + picb_physaddr) | ||
101 | #define timer (IO_BASE + timer_physaddr) | ||
102 | #define addr_xlat_map ((unsigned short *)(IO_BASE + 0x17000)) | ||
103 | |||
104 | #define isaIO2mem(x) (((((x) & 0x3f8) << 7) | (((x) & 0xfc00) >> 6) | ((x) & 0x7)) + 0x40000 + IO_BASE) | ||
105 | |||
106 | #define IRQ_APOLLO IRQ_USER | ||
107 | |||
108 | #endif | ||
diff --git a/include/asm-m68k/atafd.h b/include/asm-m68k/atafd.h deleted file mode 100644 index 8456889ee7da..000000000000 --- a/include/asm-m68k/atafd.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_FD_H | ||
2 | #define _ASM_M68K_FD_H | ||
3 | |||
4 | /* Definitions for the Atari Floppy driver */ | ||
5 | |||
6 | struct atari_format_descr { | ||
7 | int track; /* to be formatted */ | ||
8 | int head; /* "" "" */ | ||
9 | int sect_offset; /* offset of first sector */ | ||
10 | }; | ||
11 | |||
12 | #endif | ||
diff --git a/include/asm-m68k/atafdreg.h b/include/asm-m68k/atafdreg.h deleted file mode 100644 index bbf80949fd9f..000000000000 --- a/include/asm-m68k/atafdreg.h +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | #ifndef _LINUX_FDREG_H | ||
2 | #define _LINUX_FDREG_H | ||
3 | |||
4 | /* | ||
5 | ** WD1772 stuff | ||
6 | */ | ||
7 | |||
8 | /* register codes */ | ||
9 | |||
10 | #define FDCSELREG_STP (0x80) /* command/status register */ | ||
11 | #define FDCSELREG_TRA (0x82) /* track register */ | ||
12 | #define FDCSELREG_SEC (0x84) /* sector register */ | ||
13 | #define FDCSELREG_DTA (0x86) /* data register */ | ||
14 | |||
15 | /* register names for FDC_READ/WRITE macros */ | ||
16 | |||
17 | #define FDCREG_CMD 0 | ||
18 | #define FDCREG_STATUS 0 | ||
19 | #define FDCREG_TRACK 2 | ||
20 | #define FDCREG_SECTOR 4 | ||
21 | #define FDCREG_DATA 6 | ||
22 | |||
23 | /* command opcodes */ | ||
24 | |||
25 | #define FDCCMD_RESTORE (0x00) /* - */ | ||
26 | #define FDCCMD_SEEK (0x10) /* | */ | ||
27 | #define FDCCMD_STEP (0x20) /* | TYP 1 Commands */ | ||
28 | #define FDCCMD_STIN (0x40) /* | */ | ||
29 | #define FDCCMD_STOT (0x60) /* - */ | ||
30 | #define FDCCMD_RDSEC (0x80) /* - TYP 2 Commands */ | ||
31 | #define FDCCMD_WRSEC (0xa0) /* - " */ | ||
32 | #define FDCCMD_RDADR (0xc0) /* - */ | ||
33 | #define FDCCMD_RDTRA (0xe0) /* | TYP 3 Commands */ | ||
34 | #define FDCCMD_WRTRA (0xf0) /* - */ | ||
35 | #define FDCCMD_FORCI (0xd0) /* - TYP 4 Command */ | ||
36 | |||
37 | /* command modifier bits */ | ||
38 | |||
39 | #define FDCCMDADD_SR6 (0x00) /* step rate settings */ | ||
40 | #define FDCCMDADD_SR12 (0x01) | ||
41 | #define FDCCMDADD_SR2 (0x02) | ||
42 | #define FDCCMDADD_SR3 (0x03) | ||
43 | #define FDCCMDADD_V (0x04) /* verify */ | ||
44 | #define FDCCMDADD_H (0x08) /* wait for spin-up */ | ||
45 | #define FDCCMDADD_U (0x10) /* update track register */ | ||
46 | #define FDCCMDADD_M (0x10) /* multiple sector access */ | ||
47 | #define FDCCMDADD_E (0x04) /* head settling flag */ | ||
48 | #define FDCCMDADD_P (0x02) /* precompensation off */ | ||
49 | #define FDCCMDADD_A0 (0x01) /* DAM flag */ | ||
50 | |||
51 | /* status register bits */ | ||
52 | |||
53 | #define FDCSTAT_MOTORON (0x80) /* motor on */ | ||
54 | #define FDCSTAT_WPROT (0x40) /* write protected (FDCCMD_WR*) */ | ||
55 | #define FDCSTAT_SPINUP (0x20) /* motor speed stable (Type I) */ | ||
56 | #define FDCSTAT_DELDAM (0x20) /* sector has deleted DAM (Type II+III) */ | ||
57 | #define FDCSTAT_RECNF (0x10) /* record not found */ | ||
58 | #define FDCSTAT_CRC (0x08) /* CRC error */ | ||
59 | #define FDCSTAT_TR00 (0x04) /* Track 00 flag (Type I) */ | ||
60 | #define FDCSTAT_LOST (0x04) /* Lost Data (Type II+III) */ | ||
61 | #define FDCSTAT_IDX (0x02) /* Index status (Type I) */ | ||
62 | #define FDCSTAT_DRQ (0x02) /* DRQ status (Type II+III) */ | ||
63 | #define FDCSTAT_BUSY (0x01) /* FDC is busy */ | ||
64 | |||
65 | |||
66 | /* PSG Port A Bit Nr 0 .. Side Sel .. 0 -> Side 1 1 -> Side 2 */ | ||
67 | #define DSKSIDE (0x01) | ||
68 | |||
69 | #define DSKDRVNONE (0x06) | ||
70 | #define DSKDRV0 (0x02) | ||
71 | #define DSKDRV1 (0x04) | ||
72 | |||
73 | /* step rates */ | ||
74 | #define FDCSTEP_6 0x00 | ||
75 | #define FDCSTEP_12 0x01 | ||
76 | #define FDCSTEP_2 0x02 | ||
77 | #define FDCSTEP_3 0x03 | ||
78 | |||
79 | #endif | ||
diff --git a/include/asm-m68k/atari_joystick.h b/include/asm-m68k/atari_joystick.h deleted file mode 100644 index 93be7da9f2c7..000000000000 --- a/include/asm-m68k/atari_joystick.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef _LINUX_ATARI_JOYSTICK_H | ||
2 | #define _LINUX_ATARI_JOYSTICK_H | ||
3 | |||
4 | /* | ||
5 | * linux/include/linux/atari_joystick.h | ||
6 | * header file for Atari Joystick driver | ||
7 | * by Robert de Vries (robert@and.nl) on 19Jul93 | ||
8 | */ | ||
9 | |||
10 | void atari_joystick_interrupt(char*); | ||
11 | int atari_joystick_init(void); | ||
12 | extern int atari_mouse_buttons; | ||
13 | |||
14 | struct joystick_status { | ||
15 | char fire; | ||
16 | char dir; | ||
17 | int ready; | ||
18 | int active; | ||
19 | wait_queue_head_t wait; | ||
20 | }; | ||
21 | |||
22 | #endif | ||
diff --git a/include/asm-m68k/atari_stdma.h b/include/asm-m68k/atari_stdma.h deleted file mode 100644 index 8e389b7fa70c..000000000000 --- a/include/asm-m68k/atari_stdma.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | |||
2 | #ifndef _atari_stdma_h | ||
3 | #define _atari_stdma_h | ||
4 | |||
5 | |||
6 | #include <linux/interrupt.h> | ||
7 | |||
8 | |||
9 | /***************************** Prototypes *****************************/ | ||
10 | |||
11 | void stdma_lock(irq_handler_t handler, void *data); | ||
12 | void stdma_release( void ); | ||
13 | int stdma_others_waiting( void ); | ||
14 | int stdma_islocked( void ); | ||
15 | void *stdma_locked_by( void ); | ||
16 | void stdma_init( void ); | ||
17 | |||
18 | /************************* End of Prototypes **************************/ | ||
19 | |||
20 | |||
21 | |||
22 | #endif /* _atari_stdma_h */ | ||
diff --git a/include/asm-m68k/atari_stram.h b/include/asm-m68k/atari_stram.h deleted file mode 100644 index 7546d13963be..000000000000 --- a/include/asm-m68k/atari_stram.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef _M68K_ATARI_STRAM_H | ||
2 | #define _M68K_ATARI_STRAM_H | ||
3 | |||
4 | /* | ||
5 | * Functions for Atari ST-RAM management | ||
6 | */ | ||
7 | |||
8 | /* public interface */ | ||
9 | void *atari_stram_alloc(long size, const char *owner); | ||
10 | void atari_stram_free(void *); | ||
11 | |||
12 | /* functions called internally by other parts of the kernel */ | ||
13 | void atari_stram_init(void); | ||
14 | void atari_stram_reserve_pages(void *start_mem); | ||
15 | void atari_stram_mem_init_hook (void); | ||
16 | |||
17 | #endif /*_M68K_ATARI_STRAM_H */ | ||
diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h deleted file mode 100644 index 1412b4ab202f..000000000000 --- a/include/asm-m68k/atarihw.h +++ /dev/null | |||
@@ -1,807 +0,0 @@ | |||
1 | /* | ||
2 | ** linux/atarihw.h -- This header defines some macros and pointers for | ||
3 | ** the various Atari custom hardware registers. | ||
4 | ** | ||
5 | ** Copyright 1994 by Björn Brauel | ||
6 | ** | ||
7 | ** 5/1/94 Roman Hodek: | ||
8 | ** Added definitions for TT specific chips. | ||
9 | ** | ||
10 | ** 1996-09-13 lars brinkhoff <f93labr@dd.chalmers.se>: | ||
11 | ** Finally added definitions for the matrix/codec and the DSP56001 host | ||
12 | ** interface. | ||
13 | ** | ||
14 | ** This file is subject to the terms and conditions of the GNU General Public | ||
15 | ** License. See the file COPYING in the main directory of this archive | ||
16 | ** for more details. | ||
17 | ** | ||
18 | */ | ||
19 | |||
20 | #ifndef _LINUX_ATARIHW_H_ | ||
21 | #define _LINUX_ATARIHW_H_ | ||
22 | |||
23 | #include <linux/types.h> | ||
24 | #include <asm/bootinfo.h> | ||
25 | #include <asm/raw_io.h> | ||
26 | |||
27 | extern u_long atari_mch_cookie; | ||
28 | extern u_long atari_mch_type; | ||
29 | extern u_long atari_switches; | ||
30 | extern int atari_rtc_year_offset; | ||
31 | extern int atari_dont_touch_floppy_select; | ||
32 | |||
33 | /* convenience macros for testing machine type */ | ||
34 | #define MACH_IS_ST ((atari_mch_cookie >> 16) == ATARI_MCH_ST) | ||
35 | #define MACH_IS_STE ((atari_mch_cookie >> 16) == ATARI_MCH_STE && \ | ||
36 | (atari_mch_cookie & 0xffff) == 0) | ||
37 | #define MACH_IS_MSTE ((atari_mch_cookie >> 16) == ATARI_MCH_STE && \ | ||
38 | (atari_mch_cookie & 0xffff) == 0x10) | ||
39 | #define MACH_IS_TT ((atari_mch_cookie >> 16) == ATARI_MCH_TT) | ||
40 | #define MACH_IS_FALCON ((atari_mch_cookie >> 16) == ATARI_MCH_FALCON) | ||
41 | #define MACH_IS_MEDUSA (atari_mch_type == ATARI_MACH_MEDUSA) | ||
42 | #define MACH_IS_AB40 (atari_mch_type == ATARI_MACH_AB40) | ||
43 | |||
44 | /* values for atari_switches */ | ||
45 | #define ATARI_SWITCH_IKBD 0x01 | ||
46 | #define ATARI_SWITCH_MIDI 0x02 | ||
47 | #define ATARI_SWITCH_SND6 0x04 | ||
48 | #define ATARI_SWITCH_SND7 0x08 | ||
49 | #define ATARI_SWITCH_OVSC_SHIFT 16 | ||
50 | #define ATARI_SWITCH_OVSC_IKBD (ATARI_SWITCH_IKBD << ATARI_SWITCH_OVSC_SHIFT) | ||
51 | #define ATARI_SWITCH_OVSC_MIDI (ATARI_SWITCH_MIDI << ATARI_SWITCH_OVSC_SHIFT) | ||
52 | #define ATARI_SWITCH_OVSC_SND6 (ATARI_SWITCH_SND6 << ATARI_SWITCH_OVSC_SHIFT) | ||
53 | #define ATARI_SWITCH_OVSC_SND7 (ATARI_SWITCH_SND7 << ATARI_SWITCH_OVSC_SHIFT) | ||
54 | #define ATARI_SWITCH_OVSC_MASK 0xffff0000 | ||
55 | |||
56 | /* | ||
57 | * Define several Hardware-Chips for indication so that for the ATARI we do | ||
58 | * no longer decide whether it is a Falcon or other machine . It's just | ||
59 | * important what hardware the machine uses | ||
60 | */ | ||
61 | |||
62 | /* ++roman 08/08/95: rewritten from ORing constants to a C bitfield */ | ||
63 | |||
64 | #define ATARIHW_DECLARE(name) unsigned name : 1 | ||
65 | #define ATARIHW_SET(name) (atari_hw_present.name = 1) | ||
66 | #define ATARIHW_PRESENT(name) (atari_hw_present.name) | ||
67 | |||
68 | struct atari_hw_present { | ||
69 | /* video hardware */ | ||
70 | ATARIHW_DECLARE(STND_SHIFTER); /* ST-Shifter - no base low ! */ | ||
71 | ATARIHW_DECLARE(EXTD_SHIFTER); /* STe-Shifter - 24 bit address */ | ||
72 | ATARIHW_DECLARE(TT_SHIFTER); /* TT-Shifter */ | ||
73 | ATARIHW_DECLARE(VIDEL_SHIFTER); /* Falcon-Shifter */ | ||
74 | /* sound hardware */ | ||
75 | ATARIHW_DECLARE(YM_2149); /* Yamaha YM 2149 */ | ||
76 | ATARIHW_DECLARE(PCM_8BIT); /* PCM-Sound in STe-ATARI */ | ||
77 | ATARIHW_DECLARE(CODEC); /* CODEC Sound (Falcon) */ | ||
78 | /* disk storage interfaces */ | ||
79 | ATARIHW_DECLARE(TT_SCSI); /* Directly mapped NCR5380 */ | ||
80 | ATARIHW_DECLARE(ST_SCSI); /* NCR5380 via ST-DMA (Falcon) */ | ||
81 | ATARIHW_DECLARE(ACSI); /* Standard ACSI like in STs */ | ||
82 | ATARIHW_DECLARE(IDE); /* IDE Interface */ | ||
83 | ATARIHW_DECLARE(FDCSPEED); /* 8/16 MHz switch for FDC */ | ||
84 | /* other I/O hardware */ | ||
85 | ATARIHW_DECLARE(ST_MFP); /* The ST-MFP (there should be no Atari | ||
86 | without it... but who knows?) */ | ||
87 | ATARIHW_DECLARE(TT_MFP); /* 2nd MFP */ | ||
88 | ATARIHW_DECLARE(SCC); /* Serial Communications Contr. */ | ||
89 | ATARIHW_DECLARE(ST_ESCC); /* SCC Z83230 in an ST */ | ||
90 | ATARIHW_DECLARE(ANALOG_JOY); /* Paddle Interface for STe | ||
91 | and Falcon */ | ||
92 | ATARIHW_DECLARE(MICROWIRE); /* Microwire Interface */ | ||
93 | /* DMA */ | ||
94 | ATARIHW_DECLARE(STND_DMA); /* 24 Bit limited ST-DMA */ | ||
95 | ATARIHW_DECLARE(EXTD_DMA); /* 32 Bit ST-DMA */ | ||
96 | ATARIHW_DECLARE(SCSI_DMA); /* DMA for the NCR5380 */ | ||
97 | ATARIHW_DECLARE(SCC_DMA); /* DMA for the SCC */ | ||
98 | /* real time clocks */ | ||
99 | ATARIHW_DECLARE(TT_CLK); /* TT compatible clock chip */ | ||
100 | ATARIHW_DECLARE(MSTE_CLK); /* Mega ST(E) clock chip */ | ||
101 | /* supporting hardware */ | ||
102 | ATARIHW_DECLARE(SCU); /* System Control Unit */ | ||
103 | ATARIHW_DECLARE(BLITTER); /* Blitter */ | ||
104 | ATARIHW_DECLARE(VME); /* VME Bus */ | ||
105 | ATARIHW_DECLARE(DSP56K); /* DSP56k processor in Falcon */ | ||
106 | }; | ||
107 | |||
108 | extern struct atari_hw_present atari_hw_present; | ||
109 | |||
110 | |||
111 | /* Reading the MFP port register gives a machine independent delay, since the | ||
112 | * MFP always has a 8 MHz clock. This avoids problems with the varying length | ||
113 | * of nops on various machines. Somebody claimed that the tstb takes 600 ns. | ||
114 | */ | ||
115 | #define MFPDELAY() \ | ||
116 | __asm__ __volatile__ ( "tstb %0" : : "m" (mfp.par_dt_reg) : "cc" ); | ||
117 | |||
118 | /* Do cache push/invalidate for DMA read/write. This function obeys the | ||
119 | * snooping on some machines (Medusa) and processors: The Medusa itself can | ||
120 | * snoop, but only the '040 can source data from its cache to DMA writes i.e., | ||
121 | * reads from memory). Both '040 and '060 invalidate cache entries on snooped | ||
122 | * DMA reads (i.e., writes to memory). | ||
123 | */ | ||
124 | |||
125 | |||
126 | #define atari_readb raw_inb | ||
127 | #define atari_writeb raw_outb | ||
128 | |||
129 | #define atari_inb_p raw_inb | ||
130 | #define atari_outb_p raw_outb | ||
131 | |||
132 | |||
133 | |||
134 | #include <linux/mm.h> | ||
135 | #include <asm/cacheflush.h> | ||
136 | |||
137 | static inline void dma_cache_maintenance( unsigned long paddr, | ||
138 | unsigned long len, | ||
139 | int writeflag ) | ||
140 | |||
141 | { | ||
142 | if (writeflag) { | ||
143 | if (!MACH_IS_MEDUSA || CPU_IS_060) | ||
144 | cache_push( paddr, len ); | ||
145 | } | ||
146 | else { | ||
147 | if (!MACH_IS_MEDUSA) | ||
148 | cache_clear( paddr, len ); | ||
149 | } | ||
150 | } | ||
151 | |||
152 | |||
153 | /* | ||
154 | ** Shifter | ||
155 | */ | ||
156 | #define ST_LOW 0 | ||
157 | #define ST_MID 1 | ||
158 | #define ST_HIGH 2 | ||
159 | #define TT_LOW 7 | ||
160 | #define TT_MID 4 | ||
161 | #define TT_HIGH 6 | ||
162 | |||
163 | #define SHF_BAS (0xffff8200) | ||
164 | struct SHIFTER | ||
165 | { | ||
166 | u_char pad1; | ||
167 | u_char bas_hi; | ||
168 | u_char pad2; | ||
169 | u_char bas_md; | ||
170 | u_char pad3; | ||
171 | u_char volatile vcounthi; | ||
172 | u_char pad4; | ||
173 | u_char volatile vcountmid; | ||
174 | u_char pad5; | ||
175 | u_char volatile vcountlow; | ||
176 | u_char volatile syncmode; | ||
177 | u_char pad6; | ||
178 | u_char pad7; | ||
179 | u_char bas_lo; | ||
180 | }; | ||
181 | # define shifter ((*(volatile struct SHIFTER *)SHF_BAS)) | ||
182 | |||
183 | #define SHF_FBAS (0xffff820e) | ||
184 | struct SHIFTER_F030 | ||
185 | { | ||
186 | u_short off_next; | ||
187 | u_short scn_width; | ||
188 | }; | ||
189 | # define shifter_f030 ((*(volatile struct SHIFTER_F030 *)SHF_FBAS)) | ||
190 | |||
191 | |||
192 | #define SHF_TBAS (0xffff8200) | ||
193 | struct SHIFTER_TT { | ||
194 | u_char char_dummy0; | ||
195 | u_char bas_hi; /* video mem base addr, high and mid byte */ | ||
196 | u_char char_dummy1; | ||
197 | u_char bas_md; | ||
198 | u_char char_dummy2; | ||
199 | u_char vcount_hi; /* pointer to currently displayed byte */ | ||
200 | u_char char_dummy3; | ||
201 | u_char vcount_md; | ||
202 | u_char char_dummy4; | ||
203 | u_char vcount_lo; | ||
204 | u_short st_sync; /* ST compatible sync mode register, unused */ | ||
205 | u_char char_dummy5; | ||
206 | u_char bas_lo; /* video mem addr, low byte */ | ||
207 | u_char char_dummy6[2+3*16]; | ||
208 | /* $ffff8240: */ | ||
209 | u_short color_reg[16]; /* 16 color registers */ | ||
210 | u_char st_shiftmode; /* ST compatible shift mode register, unused */ | ||
211 | u_char char_dummy7; | ||
212 | u_short tt_shiftmode; /* TT shift mode register */ | ||
213 | |||
214 | |||
215 | }; | ||
216 | #define shifter_tt ((*(volatile struct SHIFTER_TT *)SHF_TBAS)) | ||
217 | |||
218 | /* values for shifter_tt->tt_shiftmode */ | ||
219 | #define TT_SHIFTER_STLOW 0x0000 | ||
220 | #define TT_SHIFTER_STMID 0x0100 | ||
221 | #define TT_SHIFTER_STHIGH 0x0200 | ||
222 | #define TT_SHIFTER_TTLOW 0x0700 | ||
223 | #define TT_SHIFTER_TTMID 0x0400 | ||
224 | #define TT_SHIFTER_TTHIGH 0x0600 | ||
225 | #define TT_SHIFTER_MODEMASK 0x0700 | ||
226 | #define TT_SHIFTER_NUMMODE 0x0008 | ||
227 | #define TT_SHIFTER_PALETTE_MASK 0x000f | ||
228 | #define TT_SHIFTER_GRAYMODE 0x1000 | ||
229 | |||
230 | /* 256 TT palette registers */ | ||
231 | #define TT_PALETTE_BASE (0xffff8400) | ||
232 | #define tt_palette ((volatile u_short *)TT_PALETTE_BASE) | ||
233 | |||
234 | #define TT_PALETTE_RED_MASK 0x0f00 | ||
235 | #define TT_PALETTE_GREEN_MASK 0x00f0 | ||
236 | #define TT_PALETTE_BLUE_MASK 0x000f | ||
237 | |||
238 | /* | ||
239 | ** Falcon030 VIDEL Video Controller | ||
240 | ** for description see File 'linux\tools\atari\hardware.txt | ||
241 | */ | ||
242 | #define f030_col ((u_long *) 0xffff9800) | ||
243 | #define f030_xreg ((u_short*) 0xffff8282) | ||
244 | #define f030_yreg ((u_short*) 0xffff82a2) | ||
245 | #define f030_creg ((u_short*) 0xffff82c0) | ||
246 | #define f030_sreg ((u_short*) 0xffff8260) | ||
247 | #define f030_mreg ((u_short*) 0xffff820a) | ||
248 | #define f030_linewidth ((u_short*) 0xffff820e) | ||
249 | #define f030_hscroll ((u_char*) 0xffff8265) | ||
250 | |||
251 | #define VIDEL_BAS (0xffff8260) | ||
252 | struct VIDEL { | ||
253 | u_short st_shift; | ||
254 | u_short pad1; | ||
255 | u_char xoffset_s; | ||
256 | u_char xoffset; | ||
257 | u_short f_shift; | ||
258 | u_char pad2[0x1a]; | ||
259 | u_short hht; | ||
260 | u_short hbb; | ||
261 | u_short hbe; | ||
262 | u_short hdb; | ||
263 | u_short hde; | ||
264 | u_short hss; | ||
265 | u_char pad3[0x14]; | ||
266 | u_short vft; | ||
267 | u_short vbb; | ||
268 | u_short vbe; | ||
269 | u_short vdb; | ||
270 | u_short vde; | ||
271 | u_short vss; | ||
272 | u_char pad4[0x12]; | ||
273 | u_short control; | ||
274 | u_short mode; | ||
275 | }; | ||
276 | #define videl ((*(volatile struct VIDEL *)VIDEL_BAS)) | ||
277 | |||
278 | /* | ||
279 | ** DMA/WD1772 Disk Controller | ||
280 | */ | ||
281 | |||
282 | #define FWD_BAS (0xffff8604) | ||
283 | struct DMA_WD | ||
284 | { | ||
285 | u_short fdc_acces_seccount; | ||
286 | u_short dma_mode_status; | ||
287 | u_char dma_vhi; /* Some extended ST-DMAs can handle 32 bit addresses */ | ||
288 | u_char dma_hi; | ||
289 | u_char char_dummy2; | ||
290 | u_char dma_md; | ||
291 | u_char char_dummy3; | ||
292 | u_char dma_lo; | ||
293 | u_short fdc_speed; | ||
294 | }; | ||
295 | # define dma_wd ((*(volatile struct DMA_WD *)FWD_BAS)) | ||
296 | /* alias */ | ||
297 | #define st_dma dma_wd | ||
298 | /* The two highest bytes of an extended DMA as a short; this is a must | ||
299 | * for the Medusa. | ||
300 | */ | ||
301 | #define st_dma_ext_dmahi (*((volatile unsigned short *)0xffff8608)) | ||
302 | |||
303 | /* | ||
304 | ** YM2149 Sound Chip | ||
305 | ** access in bytes | ||
306 | */ | ||
307 | |||
308 | #define YM_BAS (0xffff8800) | ||
309 | struct SOUND_YM | ||
310 | { | ||
311 | u_char rd_data_reg_sel; | ||
312 | u_char char_dummy1; | ||
313 | u_char wd_data; | ||
314 | }; | ||
315 | #define sound_ym ((*(volatile struct SOUND_YM *)YM_BAS)) | ||
316 | |||
317 | /* TT SCSI DMA */ | ||
318 | |||
319 | #define TT_SCSI_DMA_BAS (0xffff8700) | ||
320 | struct TT_DMA { | ||
321 | u_char char_dummy0; | ||
322 | u_char dma_addr_hi; | ||
323 | u_char char_dummy1; | ||
324 | u_char dma_addr_hmd; | ||
325 | u_char char_dummy2; | ||
326 | u_char dma_addr_lmd; | ||
327 | u_char char_dummy3; | ||
328 | u_char dma_addr_lo; | ||
329 | u_char char_dummy4; | ||
330 | u_char dma_cnt_hi; | ||
331 | u_char char_dummy5; | ||
332 | u_char dma_cnt_hmd; | ||
333 | u_char char_dummy6; | ||
334 | u_char dma_cnt_lmd; | ||
335 | u_char char_dummy7; | ||
336 | u_char dma_cnt_lo; | ||
337 | u_long dma_restdata; | ||
338 | u_short dma_ctrl; | ||
339 | }; | ||
340 | #define tt_scsi_dma ((*(volatile struct TT_DMA *)TT_SCSI_DMA_BAS)) | ||
341 | |||
342 | /* TT SCSI Controller 5380 */ | ||
343 | |||
344 | #define TT_5380_BAS (0xffff8781) | ||
345 | struct TT_5380 { | ||
346 | u_char scsi_data; | ||
347 | u_char char_dummy1; | ||
348 | u_char scsi_icr; | ||
349 | u_char char_dummy2; | ||
350 | u_char scsi_mode; | ||
351 | u_char char_dummy3; | ||
352 | u_char scsi_tcr; | ||
353 | u_char char_dummy4; | ||
354 | u_char scsi_idstat; | ||
355 | u_char char_dummy5; | ||
356 | u_char scsi_dmastat; | ||
357 | u_char char_dummy6; | ||
358 | u_char scsi_targrcv; | ||
359 | u_char char_dummy7; | ||
360 | u_char scsi_inircv; | ||
361 | }; | ||
362 | #define tt_scsi ((*(volatile struct TT_5380 *)TT_5380_BAS)) | ||
363 | #define tt_scsi_regp ((volatile char *)TT_5380_BAS) | ||
364 | |||
365 | |||
366 | /* | ||
367 | ** Falcon DMA Sound Subsystem | ||
368 | */ | ||
369 | |||
370 | #define MATRIX_BASE (0xffff8930) | ||
371 | struct MATRIX | ||
372 | { | ||
373 | u_short source; | ||
374 | u_short destination; | ||
375 | u_char external_frequency_divider; | ||
376 | u_char internal_frequency_divider; | ||
377 | }; | ||
378 | #define falcon_matrix (*(volatile struct MATRIX *)MATRIX_BASE) | ||
379 | |||
380 | #define CODEC_BASE (0xffff8936) | ||
381 | struct CODEC | ||
382 | { | ||
383 | u_char tracks; | ||
384 | u_char input_source; | ||
385 | #define CODEC_SOURCE_ADC 1 | ||
386 | #define CODEC_SOURCE_MATRIX 2 | ||
387 | u_char adc_source; | ||
388 | #define ADC_SOURCE_RIGHT_PSG 1 | ||
389 | #define ADC_SOURCE_LEFT_PSG 2 | ||
390 | u_char gain; | ||
391 | #define CODEC_GAIN_RIGHT 0x0f | ||
392 | #define CODEC_GAIN_LEFT 0xf0 | ||
393 | u_char attenuation; | ||
394 | #define CODEC_ATTENUATION_RIGHT 0x0f | ||
395 | #define CODEC_ATTENUATION_LEFT 0xf0 | ||
396 | u_char unused1; | ||
397 | u_char status; | ||
398 | #define CODEC_OVERFLOW_RIGHT 1 | ||
399 | #define CODEC_OVERFLOW_LEFT 2 | ||
400 | u_char unused2, unused3, unused4, unused5; | ||
401 | u_char gpio_directions; | ||
402 | #define GPIO_IN 0 | ||
403 | #define GPIO_OUT 1 | ||
404 | u_char unused6; | ||
405 | u_char gpio_data; | ||
406 | }; | ||
407 | #define falcon_codec (*(volatile struct CODEC *)CODEC_BASE) | ||
408 | |||
409 | /* | ||
410 | ** Falcon Blitter | ||
411 | */ | ||
412 | |||
413 | #define BLT_BAS (0xffff8a00) | ||
414 | |||
415 | struct BLITTER | ||
416 | { | ||
417 | u_short halftone[16]; | ||
418 | u_short src_x_inc; | ||
419 | u_short src_y_inc; | ||
420 | u_long src_address; | ||
421 | u_short endmask1; | ||
422 | u_short endmask2; | ||
423 | u_short endmask3; | ||
424 | u_short dst_x_inc; | ||
425 | u_short dst_y_inc; | ||
426 | u_long dst_address; | ||
427 | u_short wd_per_line; | ||
428 | u_short ln_per_bb; | ||
429 | u_short hlf_op_reg; | ||
430 | u_short log_op_reg; | ||
431 | u_short lin_nm_reg; | ||
432 | u_short skew_reg; | ||
433 | }; | ||
434 | # define blitter ((*(volatile struct BLITTER *)BLT_BAS)) | ||
435 | |||
436 | |||
437 | /* | ||
438 | ** SCC Z8530 | ||
439 | */ | ||
440 | |||
441 | #define SCC_BAS (0xffff8c81) | ||
442 | struct SCC | ||
443 | { | ||
444 | u_char cha_a_ctrl; | ||
445 | u_char char_dummy1; | ||
446 | u_char cha_a_data; | ||
447 | u_char char_dummy2; | ||
448 | u_char cha_b_ctrl; | ||
449 | u_char char_dummy3; | ||
450 | u_char cha_b_data; | ||
451 | }; | ||
452 | # define scc ((*(volatile struct SCC*)SCC_BAS)) | ||
453 | |||
454 | /* The ESCC (Z85230) in an Atari ST. The channels are reversed! */ | ||
455 | # define st_escc ((*(volatile struct SCC*)0xfffffa31)) | ||
456 | # define st_escc_dsr ((*(volatile char *)0xfffffa39)) | ||
457 | |||
458 | /* TT SCC DMA Controller (same chip as SCSI DMA) */ | ||
459 | |||
460 | #define TT_SCC_DMA_BAS (0xffff8c00) | ||
461 | #define tt_scc_dma ((*(volatile struct TT_DMA *)TT_SCC_DMA_BAS)) | ||
462 | |||
463 | /* | ||
464 | ** VIDEL Palette Register | ||
465 | */ | ||
466 | |||
467 | #define FPL_BAS (0xffff9800) | ||
468 | struct VIDEL_PALETTE | ||
469 | { | ||
470 | u_long reg[256]; | ||
471 | }; | ||
472 | # define videl_palette ((*(volatile struct VIDEL_PALETTE*)FPL_BAS)) | ||
473 | |||
474 | |||
475 | /* | ||
476 | ** Falcon DSP Host Interface | ||
477 | */ | ||
478 | |||
479 | #define DSP56K_HOST_INTERFACE_BASE (0xffffa200) | ||
480 | struct DSP56K_HOST_INTERFACE { | ||
481 | u_char icr; | ||
482 | #define DSP56K_ICR_RREQ 0x01 | ||
483 | #define DSP56K_ICR_TREQ 0x02 | ||
484 | #define DSP56K_ICR_HF0 0x08 | ||
485 | #define DSP56K_ICR_HF1 0x10 | ||
486 | #define DSP56K_ICR_HM0 0x20 | ||
487 | #define DSP56K_ICR_HM1 0x40 | ||
488 | #define DSP56K_ICR_INIT 0x80 | ||
489 | |||
490 | u_char cvr; | ||
491 | #define DSP56K_CVR_HV_MASK 0x1f | ||
492 | #define DSP56K_CVR_HC 0x80 | ||
493 | |||
494 | u_char isr; | ||
495 | #define DSP56K_ISR_RXDF 0x01 | ||
496 | #define DSP56K_ISR_TXDE 0x02 | ||
497 | #define DSP56K_ISR_TRDY 0x04 | ||
498 | #define DSP56K_ISR_HF2 0x08 | ||
499 | #define DSP56K_ISR_HF3 0x10 | ||
500 | #define DSP56K_ISR_DMA 0x40 | ||
501 | #define DSP56K_ISR_HREQ 0x80 | ||
502 | |||
503 | u_char ivr; | ||
504 | |||
505 | union { | ||
506 | u_char b[4]; | ||
507 | u_short w[2]; | ||
508 | u_long l; | ||
509 | } data; | ||
510 | }; | ||
511 | #define dsp56k_host_interface ((*(volatile struct DSP56K_HOST_INTERFACE *)DSP56K_HOST_INTERFACE_BASE)) | ||
512 | |||
513 | /* | ||
514 | ** MFP 68901 | ||
515 | */ | ||
516 | |||
517 | #define MFP_BAS (0xfffffa01) | ||
518 | struct MFP | ||
519 | { | ||
520 | u_char par_dt_reg; | ||
521 | u_char char_dummy1; | ||
522 | u_char active_edge; | ||
523 | u_char char_dummy2; | ||
524 | u_char data_dir; | ||
525 | u_char char_dummy3; | ||
526 | u_char int_en_a; | ||
527 | u_char char_dummy4; | ||
528 | u_char int_en_b; | ||
529 | u_char char_dummy5; | ||
530 | u_char int_pn_a; | ||
531 | u_char char_dummy6; | ||
532 | u_char int_pn_b; | ||
533 | u_char char_dummy7; | ||
534 | u_char int_sv_a; | ||
535 | u_char char_dummy8; | ||
536 | u_char int_sv_b; | ||
537 | u_char char_dummy9; | ||
538 | u_char int_mk_a; | ||
539 | u_char char_dummy10; | ||
540 | u_char int_mk_b; | ||
541 | u_char char_dummy11; | ||
542 | u_char vec_adr; | ||
543 | u_char char_dummy12; | ||
544 | u_char tim_ct_a; | ||
545 | u_char char_dummy13; | ||
546 | u_char tim_ct_b; | ||
547 | u_char char_dummy14; | ||
548 | u_char tim_ct_cd; | ||
549 | u_char char_dummy15; | ||
550 | u_char tim_dt_a; | ||
551 | u_char char_dummy16; | ||
552 | u_char tim_dt_b; | ||
553 | u_char char_dummy17; | ||
554 | u_char tim_dt_c; | ||
555 | u_char char_dummy18; | ||
556 | u_char tim_dt_d; | ||
557 | u_char char_dummy19; | ||
558 | u_char sync_char; | ||
559 | u_char char_dummy20; | ||
560 | u_char usart_ctr; | ||
561 | u_char char_dummy21; | ||
562 | u_char rcv_stat; | ||
563 | u_char char_dummy22; | ||
564 | u_char trn_stat; | ||
565 | u_char char_dummy23; | ||
566 | u_char usart_dta; | ||
567 | }; | ||
568 | # define mfp ((*(volatile struct MFP*)MFP_BAS)) | ||
569 | |||
570 | /* TT's second MFP */ | ||
571 | |||
572 | #define TT_MFP_BAS (0xfffffa81) | ||
573 | # define tt_mfp ((*(volatile struct MFP*)TT_MFP_BAS)) | ||
574 | |||
575 | |||
576 | /* TT System Control Unit */ | ||
577 | |||
578 | #define TT_SCU_BAS (0xffff8e01) | ||
579 | struct TT_SCU { | ||
580 | u_char sys_mask; | ||
581 | u_char char_dummy1; | ||
582 | u_char sys_stat; | ||
583 | u_char char_dummy2; | ||
584 | u_char softint; | ||
585 | u_char char_dummy3; | ||
586 | u_char vmeint; | ||
587 | u_char char_dummy4; | ||
588 | u_char gp_reg1; | ||
589 | u_char char_dummy5; | ||
590 | u_char gp_reg2; | ||
591 | u_char char_dummy6; | ||
592 | u_char vme_mask; | ||
593 | u_char char_dummy7; | ||
594 | u_char vme_stat; | ||
595 | }; | ||
596 | #define tt_scu ((*(volatile struct TT_SCU *)TT_SCU_BAS)) | ||
597 | |||
598 | /* TT real time clock */ | ||
599 | |||
600 | #define TT_RTC_BAS (0xffff8961) | ||
601 | struct TT_RTC { | ||
602 | u_char regsel; | ||
603 | u_char dummy; | ||
604 | u_char data; | ||
605 | }; | ||
606 | #define tt_rtc ((*(volatile struct TT_RTC *)TT_RTC_BAS)) | ||
607 | |||
608 | |||
609 | /* | ||
610 | ** ACIA 6850 | ||
611 | */ | ||
612 | /* constants for the ACIA registers */ | ||
613 | |||
614 | /* baudrate selection and reset (Baudrate = clock/factor) */ | ||
615 | #define ACIA_DIV1 0 | ||
616 | #define ACIA_DIV16 1 | ||
617 | #define ACIA_DIV64 2 | ||
618 | #define ACIA_RESET 3 | ||
619 | |||
620 | /* character format */ | ||
621 | #define ACIA_D7E2S (0<<2) /* 7 data, even parity, 2 stop */ | ||
622 | #define ACIA_D7O2S (1<<2) /* 7 data, odd parity, 2 stop */ | ||
623 | #define ACIA_D7E1S (2<<2) /* 7 data, even parity, 1 stop */ | ||
624 | #define ACIA_D7O1S (3<<2) /* 7 data, odd parity, 1 stop */ | ||
625 | #define ACIA_D8N2S (4<<2) /* 8 data, no parity, 2 stop */ | ||
626 | #define ACIA_D8N1S (5<<2) /* 8 data, no parity, 1 stop */ | ||
627 | #define ACIA_D8E1S (6<<2) /* 8 data, even parity, 1 stop */ | ||
628 | #define ACIA_D8O1S (7<<2) /* 8 data, odd parity, 1 stop */ | ||
629 | |||
630 | /* transmit control */ | ||
631 | #define ACIA_RLTID (0<<5) /* RTS low, TxINT disabled */ | ||
632 | #define ACIA_RLTIE (1<<5) /* RTS low, TxINT enabled */ | ||
633 | #define ACIA_RHTID (2<<5) /* RTS high, TxINT disabled */ | ||
634 | #define ACIA_RLTIDSB (3<<5) /* RTS low, TxINT disabled, send break */ | ||
635 | |||
636 | /* receive control */ | ||
637 | #define ACIA_RID (0<<7) /* RxINT disabled */ | ||
638 | #define ACIA_RIE (1<<7) /* RxINT enabled */ | ||
639 | |||
640 | /* status fields of the ACIA */ | ||
641 | #define ACIA_RDRF 1 /* Receive Data Register Full */ | ||
642 | #define ACIA_TDRE (1<<1) /* Transmit Data Register Empty */ | ||
643 | #define ACIA_DCD (1<<2) /* Data Carrier Detect */ | ||
644 | #define ACIA_CTS (1<<3) /* Clear To Send */ | ||
645 | #define ACIA_FE (1<<4) /* Framing Error */ | ||
646 | #define ACIA_OVRN (1<<5) /* Receiver Overrun */ | ||
647 | #define ACIA_PE (1<<6) /* Parity Error */ | ||
648 | #define ACIA_IRQ (1<<7) /* Interrupt Request */ | ||
649 | |||
650 | #define ACIA_BAS (0xfffffc00) | ||
651 | struct ACIA | ||
652 | { | ||
653 | u_char key_ctrl; | ||
654 | u_char char_dummy1; | ||
655 | u_char key_data; | ||
656 | u_char char_dummy2; | ||
657 | u_char mid_ctrl; | ||
658 | u_char char_dummy3; | ||
659 | u_char mid_data; | ||
660 | }; | ||
661 | # define acia ((*(volatile struct ACIA*)ACIA_BAS)) | ||
662 | |||
663 | #define TT_DMASND_BAS (0xffff8900) | ||
664 | struct TT_DMASND { | ||
665 | u_char int_ctrl; /* Falcon: Interrupt control */ | ||
666 | u_char ctrl; | ||
667 | u_char pad2; | ||
668 | u_char bas_hi; | ||
669 | u_char pad3; | ||
670 | u_char bas_mid; | ||
671 | u_char pad4; | ||
672 | u_char bas_low; | ||
673 | u_char pad5; | ||
674 | u_char addr_hi; | ||
675 | u_char pad6; | ||
676 | u_char addr_mid; | ||
677 | u_char pad7; | ||
678 | u_char addr_low; | ||
679 | u_char pad8; | ||
680 | u_char end_hi; | ||
681 | u_char pad9; | ||
682 | u_char end_mid; | ||
683 | u_char pad10; | ||
684 | u_char end_low; | ||
685 | u_char pad11[12]; | ||
686 | u_char track_select; /* Falcon */ | ||
687 | u_char mode; | ||
688 | u_char pad12[14]; | ||
689 | /* Falcon only: */ | ||
690 | u_short cbar_src; | ||
691 | u_short cbar_dst; | ||
692 | u_char ext_div; | ||
693 | u_char int_div; | ||
694 | u_char rec_track_select; | ||
695 | u_char dac_src; | ||
696 | u_char adc_src; | ||
697 | u_char input_gain; | ||
698 | u_short output_atten; | ||
699 | }; | ||
700 | # define tt_dmasnd ((*(volatile struct TT_DMASND *)TT_DMASND_BAS)) | ||
701 | |||
702 | #define DMASND_MFP_INT_REPLAY 0x01 | ||
703 | #define DMASND_MFP_INT_RECORD 0x02 | ||
704 | #define DMASND_TIMERA_INT_REPLAY 0x04 | ||
705 | #define DMASND_TIMERA_INT_RECORD 0x08 | ||
706 | |||
707 | #define DMASND_CTRL_OFF 0x00 | ||
708 | #define DMASND_CTRL_ON 0x01 | ||
709 | #define DMASND_CTRL_REPEAT 0x02 | ||
710 | #define DMASND_CTRL_RECORD_ON 0x10 | ||
711 | #define DMASND_CTRL_RECORD_OFF 0x00 | ||
712 | #define DMASND_CTRL_RECORD_REPEAT 0x20 | ||
713 | #define DMASND_CTRL_SELECT_REPLAY 0x00 | ||
714 | #define DMASND_CTRL_SELECT_RECORD 0x80 | ||
715 | #define DMASND_MODE_MONO 0x80 | ||
716 | #define DMASND_MODE_STEREO 0x00 | ||
717 | #define DMASND_MODE_8BIT 0x00 | ||
718 | #define DMASND_MODE_16BIT 0x40 /* Falcon only */ | ||
719 | #define DMASND_MODE_6KHZ 0x00 /* Falcon: mute */ | ||
720 | #define DMASND_MODE_12KHZ 0x01 | ||
721 | #define DMASND_MODE_25KHZ 0x02 | ||
722 | #define DMASND_MODE_50KHZ 0x03 | ||
723 | |||
724 | |||
725 | #define DMASNDSetBase(bufstart) \ | ||
726 | do { \ | ||
727 | tt_dmasnd.bas_hi = (unsigned char)(((bufstart) & 0xff0000) >> 16); \ | ||
728 | tt_dmasnd.bas_mid = (unsigned char)(((bufstart) & 0x00ff00) >> 8); \ | ||
729 | tt_dmasnd.bas_low = (unsigned char) ((bufstart) & 0x0000ff); \ | ||
730 | } while( 0 ) | ||
731 | |||
732 | #define DMASNDGetAdr() ((tt_dmasnd.addr_hi << 16) + \ | ||
733 | (tt_dmasnd.addr_mid << 8) + \ | ||
734 | (tt_dmasnd.addr_low)) | ||
735 | |||
736 | #define DMASNDSetEnd(bufend) \ | ||
737 | do { \ | ||
738 | tt_dmasnd.end_hi = (unsigned char)(((bufend) & 0xff0000) >> 16); \ | ||
739 | tt_dmasnd.end_mid = (unsigned char)(((bufend) & 0x00ff00) >> 8); \ | ||
740 | tt_dmasnd.end_low = (unsigned char) ((bufend) & 0x0000ff); \ | ||
741 | } while( 0 ) | ||
742 | |||
743 | |||
744 | #define TT_MICROWIRE_BAS (0xffff8922) | ||
745 | struct TT_MICROWIRE { | ||
746 | u_short data; | ||
747 | u_short mask; | ||
748 | }; | ||
749 | # define tt_microwire ((*(volatile struct TT_MICROWIRE *)TT_MICROWIRE_BAS)) | ||
750 | |||
751 | #define MW_LM1992_ADDR 0x0400 | ||
752 | |||
753 | #define MW_LM1992_VOLUME(dB) \ | ||
754 | (0x0c0 | ((dB) < -80 ? 0 : (dB) > 0 ? 40 : (((dB) + 80) / 2))) | ||
755 | #define MW_LM1992_BALLEFT(dB) \ | ||
756 | (0x140 | ((dB) < -40 ? 0 : (dB) > 0 ? 20 : (((dB) + 40) / 2))) | ||
757 | #define MW_LM1992_BALRIGHT(dB) \ | ||
758 | (0x100 | ((dB) < -40 ? 0 : (dB) > 0 ? 20 : (((dB) + 40) / 2))) | ||
759 | #define MW_LM1992_TREBLE(dB) \ | ||
760 | (0x080 | ((dB) < -12 ? 0 : (dB) > 12 ? 12 : (((dB) / 2) + 6))) | ||
761 | #define MW_LM1992_BASS(dB) \ | ||
762 | (0x040 | ((dB) < -12 ? 0 : (dB) > 12 ? 12 : (((dB) / 2) + 6))) | ||
763 | |||
764 | #define MW_LM1992_PSG_LOW 0x000 | ||
765 | #define MW_LM1992_PSG_HIGH 0x001 | ||
766 | #define MW_LM1992_PSG_OFF 0x002 | ||
767 | |||
768 | #define MSTE_RTC_BAS (0xfffffc21) | ||
769 | |||
770 | struct MSTE_RTC { | ||
771 | u_char sec_ones; | ||
772 | u_char dummy1; | ||
773 | u_char sec_tens; | ||
774 | u_char dummy2; | ||
775 | u_char min_ones; | ||
776 | u_char dummy3; | ||
777 | u_char min_tens; | ||
778 | u_char dummy4; | ||
779 | u_char hr_ones; | ||
780 | u_char dummy5; | ||
781 | u_char hr_tens; | ||
782 | u_char dummy6; | ||
783 | u_char weekday; | ||
784 | u_char dummy7; | ||
785 | u_char day_ones; | ||
786 | u_char dummy8; | ||
787 | u_char day_tens; | ||
788 | u_char dummy9; | ||
789 | u_char mon_ones; | ||
790 | u_char dummy10; | ||
791 | u_char mon_tens; | ||
792 | u_char dummy11; | ||
793 | u_char year_ones; | ||
794 | u_char dummy12; | ||
795 | u_char year_tens; | ||
796 | u_char dummy13; | ||
797 | u_char mode; | ||
798 | u_char dummy14; | ||
799 | u_char test; | ||
800 | u_char dummy15; | ||
801 | u_char reset; | ||
802 | }; | ||
803 | |||
804 | #define mste_rtc ((*(volatile struct MSTE_RTC *)MSTE_RTC_BAS)) | ||
805 | |||
806 | #endif /* linux/atarihw.h */ | ||
807 | |||
diff --git a/include/asm-m68k/atariints.h b/include/asm-m68k/atariints.h deleted file mode 100644 index 5748e99f4e26..000000000000 --- a/include/asm-m68k/atariints.h +++ /dev/null | |||
@@ -1,204 +0,0 @@ | |||
1 | /* | ||
2 | ** atariints.h -- Atari Linux interrupt handling structs and prototypes | ||
3 | ** | ||
4 | ** Copyright 1994 by Björn Brauel | ||
5 | ** | ||
6 | ** 5/2/94 Roman Hodek: | ||
7 | ** TT interrupt definitions added. | ||
8 | ** | ||
9 | ** 12/02/96: (Roman) | ||
10 | ** Adapted to new int handling scheme (see ataints.c); revised numbering | ||
11 | ** | ||
12 | ** This file is subject to the terms and conditions of the GNU General Public | ||
13 | ** License. See the file COPYING in the main directory of this archive | ||
14 | ** for more details. | ||
15 | ** | ||
16 | */ | ||
17 | |||
18 | #ifndef _LINUX_ATARIINTS_H_ | ||
19 | #define _LINUX_ATARIINTS_H_ | ||
20 | |||
21 | #include <asm/irq.h> | ||
22 | #include <asm/atarihw.h> | ||
23 | |||
24 | /* | ||
25 | ** Atari Interrupt sources. | ||
26 | ** | ||
27 | */ | ||
28 | |||
29 | #define STMFP_SOURCE_BASE 8 | ||
30 | #define TTMFP_SOURCE_BASE 24 | ||
31 | #define SCC_SOURCE_BASE 40 | ||
32 | #define VME_SOURCE_BASE 56 | ||
33 | #define VME_MAX_SOURCES 16 | ||
34 | |||
35 | #define NUM_ATARI_SOURCES (VME_SOURCE_BASE+VME_MAX_SOURCES-STMFP_SOURCE_BASE) | ||
36 | |||
37 | /* convert vector number to int source number */ | ||
38 | #define IRQ_VECTOR_TO_SOURCE(v) ((v) - ((v) < 0x20 ? 0x18 : (0x40-8))) | ||
39 | |||
40 | /* convert irq_handler index to vector number */ | ||
41 | #define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) | ||
42 | |||
43 | /* interrupt service types */ | ||
44 | #define IRQ_TYPE_SLOW 0 | ||
45 | #define IRQ_TYPE_FAST 1 | ||
46 | #define IRQ_TYPE_PRIO 2 | ||
47 | |||
48 | /* ST-MFP interrupts */ | ||
49 | #define IRQ_MFP_BUSY (8) | ||
50 | #define IRQ_MFP_DCD (9) | ||
51 | #define IRQ_MFP_CTS (10) | ||
52 | #define IRQ_MFP_GPU (11) | ||
53 | #define IRQ_MFP_TIMD (12) | ||
54 | #define IRQ_MFP_TIMC (13) | ||
55 | #define IRQ_MFP_ACIA (14) | ||
56 | #define IRQ_MFP_FDC (15) | ||
57 | #define IRQ_MFP_ACSI IRQ_MFP_FDC | ||
58 | #define IRQ_MFP_FSCSI IRQ_MFP_FDC | ||
59 | #define IRQ_MFP_IDE IRQ_MFP_FDC | ||
60 | #define IRQ_MFP_TIMB (16) | ||
61 | #define IRQ_MFP_SERERR (17) | ||
62 | #define IRQ_MFP_SEREMPT (18) | ||
63 | #define IRQ_MFP_RECERR (19) | ||
64 | #define IRQ_MFP_RECFULL (20) | ||
65 | #define IRQ_MFP_TIMA (21) | ||
66 | #define IRQ_MFP_RI (22) | ||
67 | #define IRQ_MFP_MMD (23) | ||
68 | |||
69 | /* TT-MFP interrupts */ | ||
70 | #define IRQ_TT_MFP_IO0 (24) | ||
71 | #define IRQ_TT_MFP_IO1 (25) | ||
72 | #define IRQ_TT_MFP_SCC (26) | ||
73 | #define IRQ_TT_MFP_RI (27) | ||
74 | #define IRQ_TT_MFP_TIMD (28) | ||
75 | #define IRQ_TT_MFP_TIMC (29) | ||
76 | #define IRQ_TT_MFP_DRVRDY (30) | ||
77 | #define IRQ_TT_MFP_SCSIDMA (31) | ||
78 | #define IRQ_TT_MFP_TIMB (32) | ||
79 | #define IRQ_TT_MFP_SERERR (33) | ||
80 | #define IRQ_TT_MFP_SEREMPT (34) | ||
81 | #define IRQ_TT_MFP_RECERR (35) | ||
82 | #define IRQ_TT_MFP_RECFULL (36) | ||
83 | #define IRQ_TT_MFP_TIMA (37) | ||
84 | #define IRQ_TT_MFP_RTC (38) | ||
85 | #define IRQ_TT_MFP_SCSI (39) | ||
86 | |||
87 | /* SCC interrupts */ | ||
88 | #define IRQ_SCCB_TX (40) | ||
89 | #define IRQ_SCCB_STAT (42) | ||
90 | #define IRQ_SCCB_RX (44) | ||
91 | #define IRQ_SCCB_SPCOND (46) | ||
92 | #define IRQ_SCCA_TX (48) | ||
93 | #define IRQ_SCCA_STAT (50) | ||
94 | #define IRQ_SCCA_RX (52) | ||
95 | #define IRQ_SCCA_SPCOND (54) | ||
96 | |||
97 | |||
98 | #define INT_CLK 24576 /* CLK while int_clk =2.456MHz and divide = 100 */ | ||
99 | #define INT_TICKS 246 /* to make sched_time = 99.902... HZ */ | ||
100 | |||
101 | |||
102 | #define MFP_ENABLE 0 | ||
103 | #define MFP_PENDING 1 | ||
104 | #define MFP_SERVICE 2 | ||
105 | #define MFP_MASK 3 | ||
106 | |||
107 | /* Utility functions for setting/clearing bits in the interrupt registers of | ||
108 | * the MFP. 'type' should be constant, if 'irq' is constant, too, code size is | ||
109 | * reduced. set_mfp_bit() is nonsense for PENDING and SERVICE registers. */ | ||
110 | |||
111 | static inline int get_mfp_bit( unsigned irq, int type ) | ||
112 | |||
113 | { unsigned char mask, *reg; | ||
114 | |||
115 | mask = 1 << (irq & 7); | ||
116 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
117 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
118 | return( *reg & mask ); | ||
119 | } | ||
120 | |||
121 | static inline void set_mfp_bit( unsigned irq, int type ) | ||
122 | |||
123 | { unsigned char mask, *reg; | ||
124 | |||
125 | mask = 1 << (irq & 7); | ||
126 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
127 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
128 | __asm__ __volatile__ ( "orb %0,%1" | ||
129 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
130 | } | ||
131 | |||
132 | static inline void clear_mfp_bit( unsigned irq, int type ) | ||
133 | |||
134 | { unsigned char mask, *reg; | ||
135 | |||
136 | mask = ~(1 << (irq & 7)); | ||
137 | reg = (unsigned char *)&mfp.int_en_a + type*4 + | ||
138 | ((irq & 8) >> 2) + (((irq-8) & 16) << 3); | ||
139 | if (type == MFP_PENDING || type == MFP_SERVICE) | ||
140 | __asm__ __volatile__ ( "moveb %0,%1" | ||
141 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
142 | else | ||
143 | __asm__ __volatile__ ( "andb %0,%1" | ||
144 | : : "di" (mask), "m" (*reg) : "memory" ); | ||
145 | } | ||
146 | |||
147 | /* | ||
148 | * {en,dis}able_irq have the usual semantics of temporary blocking the | ||
149 | * interrupt, but not loosing requests that happen between disabling and | ||
150 | * enabling. This is done with the MFP mask registers. | ||
151 | */ | ||
152 | |||
153 | static inline void atari_enable_irq( unsigned irq ) | ||
154 | |||
155 | { | ||
156 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
157 | set_mfp_bit( irq, MFP_MASK ); | ||
158 | } | ||
159 | |||
160 | static inline void atari_disable_irq( unsigned irq ) | ||
161 | |||
162 | { | ||
163 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
164 | clear_mfp_bit( irq, MFP_MASK ); | ||
165 | } | ||
166 | |||
167 | /* | ||
168 | * In opposite to {en,dis}able_irq, requests between turn{off,on}_irq are not | ||
169 | * "stored" | ||
170 | */ | ||
171 | |||
172 | static inline void atari_turnon_irq( unsigned irq ) | ||
173 | |||
174 | { | ||
175 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
176 | set_mfp_bit( irq, MFP_ENABLE ); | ||
177 | } | ||
178 | |||
179 | static inline void atari_turnoff_irq( unsigned irq ) | ||
180 | |||
181 | { | ||
182 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
183 | clear_mfp_bit( irq, MFP_ENABLE ); | ||
184 | clear_mfp_bit( irq, MFP_PENDING ); | ||
185 | } | ||
186 | |||
187 | static inline void atari_clear_pending_irq( unsigned irq ) | ||
188 | |||
189 | { | ||
190 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return; | ||
191 | clear_mfp_bit( irq, MFP_PENDING ); | ||
192 | } | ||
193 | |||
194 | static inline int atari_irq_pending( unsigned irq ) | ||
195 | |||
196 | { | ||
197 | if (irq < STMFP_SOURCE_BASE || irq >= SCC_SOURCE_BASE) return( 0 ); | ||
198 | return( get_mfp_bit( irq, MFP_PENDING ) ); | ||
199 | } | ||
200 | |||
201 | unsigned long atari_register_vme_int( void ); | ||
202 | void atari_unregister_vme_int( unsigned long ); | ||
203 | |||
204 | #endif /* linux/atariints.h */ | ||
diff --git a/include/asm-m68k/atarikb.h b/include/asm-m68k/atarikb.h deleted file mode 100644 index 546e7da5804f..000000000000 --- a/include/asm-m68k/atarikb.h +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | /* | ||
2 | ** atarikb.h -- This header contains the prototypes of functions of | ||
3 | ** the intelligent keyboard of the Atari needed by the | ||
4 | ** mouse and joystick drivers. | ||
5 | ** | ||
6 | ** Copyright 1994 by Robert de Vries | ||
7 | ** | ||
8 | ** This file is subject to the terms and conditions of the GNU General Public | ||
9 | ** License. See the file COPYING in the main directory of this archive | ||
10 | ** for more details. | ||
11 | ** | ||
12 | ** Created: 20 Feb 1994 by Robert de Vries | ||
13 | */ | ||
14 | |||
15 | #ifndef _LINUX_ATARIKB_H | ||
16 | #define _LINUX_ATARIKB_H | ||
17 | |||
18 | void ikbd_write(const char *, int); | ||
19 | void ikbd_mouse_button_action(int mode); | ||
20 | void ikbd_mouse_rel_pos(void); | ||
21 | void ikbd_mouse_abs_pos(int xmax, int ymax); | ||
22 | void ikbd_mouse_kbd_mode(int dx, int dy); | ||
23 | void ikbd_mouse_thresh(int x, int y); | ||
24 | void ikbd_mouse_scale(int x, int y); | ||
25 | void ikbd_mouse_pos_get(int *x, int *y); | ||
26 | void ikbd_mouse_pos_set(int x, int y); | ||
27 | void ikbd_mouse_y0_bot(void); | ||
28 | void ikbd_mouse_y0_top(void); | ||
29 | void ikbd_mouse_disable(void); | ||
30 | void ikbd_joystick_event_on(void); | ||
31 | void ikbd_joystick_event_off(void); | ||
32 | void ikbd_joystick_get_state(void); | ||
33 | void ikbd_joystick_disable(void); | ||
34 | |||
35 | /* Hook for MIDI serial driver */ | ||
36 | extern void (*atari_MIDI_interrupt_hook) (void); | ||
37 | /* Hook for mouse driver */ | ||
38 | extern void (*atari_mouse_interrupt_hook) (char *); | ||
39 | /* Hook for keyboard inputdev driver */ | ||
40 | extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); | ||
41 | /* Hook for mouse inputdev driver */ | ||
42 | extern void (*atari_input_mouse_interrupt_hook) (char *); | ||
43 | |||
44 | int atari_keyb_init(void); | ||
45 | |||
46 | #endif /* _LINUX_ATARIKB_H */ | ||
diff --git a/include/asm-m68k/atomic.h b/include/asm-m68k/atomic.h deleted file mode 100644 index eb0ab9d4ee77..000000000000 --- a/include/asm-m68k/atomic.h +++ /dev/null | |||
@@ -1,196 +0,0 @@ | |||
1 | #ifndef __ARCH_M68K_ATOMIC__ | ||
2 | #define __ARCH_M68K_ATOMIC__ | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | #include <asm/system.h> | ||
6 | |||
7 | /* | ||
8 | * Atomic operations that C can't guarantee us. Useful for | ||
9 | * resource counting etc.. | ||
10 | */ | ||
11 | |||
12 | /* | ||
13 | * We do not have SMP m68k systems, so we don't have to deal with that. | ||
14 | */ | ||
15 | |||
16 | #define ATOMIC_INIT(i) { (i) } | ||
17 | |||
18 | #define atomic_read(v) ((v)->counter) | ||
19 | #define atomic_set(v, i) (((v)->counter) = i) | ||
20 | |||
21 | static inline void atomic_add(int i, atomic_t *v) | ||
22 | { | ||
23 | __asm__ __volatile__("addl %1,%0" : "+m" (*v) : "id" (i)); | ||
24 | } | ||
25 | |||
26 | static inline void atomic_sub(int i, atomic_t *v) | ||
27 | { | ||
28 | __asm__ __volatile__("subl %1,%0" : "+m" (*v) : "id" (i)); | ||
29 | } | ||
30 | |||
31 | static inline void atomic_inc(atomic_t *v) | ||
32 | { | ||
33 | __asm__ __volatile__("addql #1,%0" : "+m" (*v)); | ||
34 | } | ||
35 | |||
36 | static inline void atomic_dec(atomic_t *v) | ||
37 | { | ||
38 | __asm__ __volatile__("subql #1,%0" : "+m" (*v)); | ||
39 | } | ||
40 | |||
41 | static inline int atomic_dec_and_test(atomic_t *v) | ||
42 | { | ||
43 | char c; | ||
44 | __asm__ __volatile__("subql #1,%1; seq %0" : "=d" (c), "+m" (*v)); | ||
45 | return c != 0; | ||
46 | } | ||
47 | |||
48 | static inline int atomic_inc_and_test(atomic_t *v) | ||
49 | { | ||
50 | char c; | ||
51 | __asm__ __volatile__("addql #1,%1; seq %0" : "=d" (c), "+m" (*v)); | ||
52 | return c != 0; | ||
53 | } | ||
54 | |||
55 | #ifdef CONFIG_RMW_INSNS | ||
56 | |||
57 | static inline int atomic_add_return(int i, atomic_t *v) | ||
58 | { | ||
59 | int t, tmp; | ||
60 | |||
61 | __asm__ __volatile__( | ||
62 | "1: movel %2,%1\n" | ||
63 | " addl %3,%1\n" | ||
64 | " casl %2,%1,%0\n" | ||
65 | " jne 1b" | ||
66 | : "+m" (*v), "=&d" (t), "=&d" (tmp) | ||
67 | : "g" (i), "2" (atomic_read(v))); | ||
68 | return t; | ||
69 | } | ||
70 | |||
71 | static inline int atomic_sub_return(int i, atomic_t *v) | ||
72 | { | ||
73 | int t, tmp; | ||
74 | |||
75 | __asm__ __volatile__( | ||
76 | "1: movel %2,%1\n" | ||
77 | " subl %3,%1\n" | ||
78 | " casl %2,%1,%0\n" | ||
79 | " jne 1b" | ||
80 | : "+m" (*v), "=&d" (t), "=&d" (tmp) | ||
81 | : "g" (i), "2" (atomic_read(v))); | ||
82 | return t; | ||
83 | } | ||
84 | |||
85 | #define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) | ||
86 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | ||
87 | |||
88 | #else /* !CONFIG_RMW_INSNS */ | ||
89 | |||
90 | static inline int atomic_add_return(int i, atomic_t * v) | ||
91 | { | ||
92 | unsigned long flags; | ||
93 | int t; | ||
94 | |||
95 | local_irq_save(flags); | ||
96 | t = atomic_read(v); | ||
97 | t += i; | ||
98 | atomic_set(v, t); | ||
99 | local_irq_restore(flags); | ||
100 | |||
101 | return t; | ||
102 | } | ||
103 | |||
104 | static inline int atomic_sub_return(int i, atomic_t * v) | ||
105 | { | ||
106 | unsigned long flags; | ||
107 | int t; | ||
108 | |||
109 | local_irq_save(flags); | ||
110 | t = atomic_read(v); | ||
111 | t -= i; | ||
112 | atomic_set(v, t); | ||
113 | local_irq_restore(flags); | ||
114 | |||
115 | return t; | ||
116 | } | ||
117 | |||
118 | static inline int atomic_cmpxchg(atomic_t *v, int old, int new) | ||
119 | { | ||
120 | unsigned long flags; | ||
121 | int prev; | ||
122 | |||
123 | local_irq_save(flags); | ||
124 | prev = atomic_read(v); | ||
125 | if (prev == old) | ||
126 | atomic_set(v, new); | ||
127 | local_irq_restore(flags); | ||
128 | return prev; | ||
129 | } | ||
130 | |||
131 | static inline int atomic_xchg(atomic_t *v, int new) | ||
132 | { | ||
133 | unsigned long flags; | ||
134 | int prev; | ||
135 | |||
136 | local_irq_save(flags); | ||
137 | prev = atomic_read(v); | ||
138 | atomic_set(v, new); | ||
139 | local_irq_restore(flags); | ||
140 | return prev; | ||
141 | } | ||
142 | |||
143 | #endif /* !CONFIG_RMW_INSNS */ | ||
144 | |||
145 | #define atomic_dec_return(v) atomic_sub_return(1, (v)) | ||
146 | #define atomic_inc_return(v) atomic_add_return(1, (v)) | ||
147 | |||
148 | static inline int atomic_sub_and_test(int i, atomic_t *v) | ||
149 | { | ||
150 | char c; | ||
151 | __asm__ __volatile__("subl %2,%1; seq %0" : "=d" (c), "+m" (*v): "g" (i)); | ||
152 | return c != 0; | ||
153 | } | ||
154 | |||
155 | static inline int atomic_add_negative(int i, atomic_t *v) | ||
156 | { | ||
157 | char c; | ||
158 | __asm__ __volatile__("addl %2,%1; smi %0" : "=d" (c), "+m" (*v): "g" (i)); | ||
159 | return c != 0; | ||
160 | } | ||
161 | |||
162 | static inline void atomic_clear_mask(unsigned long mask, unsigned long *v) | ||
163 | { | ||
164 | __asm__ __volatile__("andl %1,%0" : "+m" (*v) : "id" (~(mask))); | ||
165 | } | ||
166 | |||
167 | static inline void atomic_set_mask(unsigned long mask, unsigned long *v) | ||
168 | { | ||
169 | __asm__ __volatile__("orl %1,%0" : "+m" (*v) : "id" (mask)); | ||
170 | } | ||
171 | |||
172 | static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | ||
173 | { | ||
174 | int c, old; | ||
175 | c = atomic_read(v); | ||
176 | for (;;) { | ||
177 | if (unlikely(c == (u))) | ||
178 | break; | ||
179 | old = atomic_cmpxchg((v), c, c + (a)); | ||
180 | if (likely(old == c)) | ||
181 | break; | ||
182 | c = old; | ||
183 | } | ||
184 | return c != (u); | ||
185 | } | ||
186 | |||
187 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | ||
188 | |||
189 | /* Atomic operations are already serializing */ | ||
190 | #define smp_mb__before_atomic_dec() barrier() | ||
191 | #define smp_mb__after_atomic_dec() barrier() | ||
192 | #define smp_mb__before_atomic_inc() barrier() | ||
193 | #define smp_mb__after_atomic_inc() barrier() | ||
194 | |||
195 | #include <asm-generic/atomic.h> | ||
196 | #endif /* __ARCH_M68K_ATOMIC __ */ | ||
diff --git a/include/asm-m68k/auxvec.h b/include/asm-m68k/auxvec.h deleted file mode 100644 index 844d6d52204b..000000000000 --- a/include/asm-m68k/auxvec.h +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #ifndef __ASMm68k_AUXVEC_H | ||
2 | #define __ASMm68k_AUXVEC_H | ||
3 | |||
4 | #endif | ||
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h deleted file mode 100644 index 9bde784e7bad..000000000000 --- a/include/asm-m68k/bitops.h +++ /dev/null | |||
@@ -1,464 +0,0 @@ | |||
1 | #ifndef _M68K_BITOPS_H | ||
2 | #define _M68K_BITOPS_H | ||
3 | /* | ||
4 | * Copyright 1992, Linus Torvalds. | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | |||
11 | #ifndef _LINUX_BITOPS_H | ||
12 | #error only <linux/bitops.h> can be included directly | ||
13 | #endif | ||
14 | |||
15 | #include <linux/compiler.h> | ||
16 | |||
17 | /* | ||
18 | * Require 68020 or better. | ||
19 | * | ||
20 | * They use the standard big-endian m680x0 bit ordering. | ||
21 | */ | ||
22 | |||
23 | #define test_and_set_bit(nr,vaddr) \ | ||
24 | (__builtin_constant_p(nr) ? \ | ||
25 | __constant_test_and_set_bit(nr, vaddr) : \ | ||
26 | __generic_test_and_set_bit(nr, vaddr)) | ||
27 | |||
28 | #define __test_and_set_bit(nr,vaddr) test_and_set_bit(nr,vaddr) | ||
29 | |||
30 | static inline int __constant_test_and_set_bit(int nr, unsigned long *vaddr) | ||
31 | { | ||
32 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
33 | char retval; | ||
34 | |||
35 | __asm__ __volatile__ ("bset %2,%1; sne %0" | ||
36 | : "=d" (retval), "+m" (*p) | ||
37 | : "di" (nr & 7)); | ||
38 | |||
39 | return retval; | ||
40 | } | ||
41 | |||
42 | static inline int __generic_test_and_set_bit(int nr, unsigned long *vaddr) | ||
43 | { | ||
44 | char retval; | ||
45 | |||
46 | __asm__ __volatile__ ("bfset %2{%1:#1}; sne %0" | ||
47 | : "=d" (retval) : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
48 | |||
49 | return retval; | ||
50 | } | ||
51 | |||
52 | #define set_bit(nr,vaddr) \ | ||
53 | (__builtin_constant_p(nr) ? \ | ||
54 | __constant_set_bit(nr, vaddr) : \ | ||
55 | __generic_set_bit(nr, vaddr)) | ||
56 | |||
57 | #define __set_bit(nr,vaddr) set_bit(nr,vaddr) | ||
58 | |||
59 | static inline void __constant_set_bit(int nr, volatile unsigned long *vaddr) | ||
60 | { | ||
61 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
62 | __asm__ __volatile__ ("bset %1,%0" | ||
63 | : "+m" (*p) : "di" (nr & 7)); | ||
64 | } | ||
65 | |||
66 | static inline void __generic_set_bit(int nr, volatile unsigned long *vaddr) | ||
67 | { | ||
68 | __asm__ __volatile__ ("bfset %1{%0:#1}" | ||
69 | : : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
70 | } | ||
71 | |||
72 | #define test_and_clear_bit(nr,vaddr) \ | ||
73 | (__builtin_constant_p(nr) ? \ | ||
74 | __constant_test_and_clear_bit(nr, vaddr) : \ | ||
75 | __generic_test_and_clear_bit(nr, vaddr)) | ||
76 | |||
77 | #define __test_and_clear_bit(nr,vaddr) test_and_clear_bit(nr,vaddr) | ||
78 | |||
79 | static inline int __constant_test_and_clear_bit(int nr, unsigned long *vaddr) | ||
80 | { | ||
81 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
82 | char retval; | ||
83 | |||
84 | __asm__ __volatile__ ("bclr %2,%1; sne %0" | ||
85 | : "=d" (retval), "+m" (*p) | ||
86 | : "di" (nr & 7)); | ||
87 | |||
88 | return retval; | ||
89 | } | ||
90 | |||
91 | static inline int __generic_test_and_clear_bit(int nr, unsigned long *vaddr) | ||
92 | { | ||
93 | char retval; | ||
94 | |||
95 | __asm__ __volatile__ ("bfclr %2{%1:#1}; sne %0" | ||
96 | : "=d" (retval) : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
97 | |||
98 | return retval; | ||
99 | } | ||
100 | |||
101 | /* | ||
102 | * clear_bit() doesn't provide any barrier for the compiler. | ||
103 | */ | ||
104 | #define smp_mb__before_clear_bit() barrier() | ||
105 | #define smp_mb__after_clear_bit() barrier() | ||
106 | |||
107 | #define clear_bit(nr,vaddr) \ | ||
108 | (__builtin_constant_p(nr) ? \ | ||
109 | __constant_clear_bit(nr, vaddr) : \ | ||
110 | __generic_clear_bit(nr, vaddr)) | ||
111 | #define __clear_bit(nr,vaddr) clear_bit(nr,vaddr) | ||
112 | |||
113 | static inline void __constant_clear_bit(int nr, volatile unsigned long *vaddr) | ||
114 | { | ||
115 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
116 | __asm__ __volatile__ ("bclr %1,%0" | ||
117 | : "+m" (*p) : "di" (nr & 7)); | ||
118 | } | ||
119 | |||
120 | static inline void __generic_clear_bit(int nr, volatile unsigned long *vaddr) | ||
121 | { | ||
122 | __asm__ __volatile__ ("bfclr %1{%0:#1}" | ||
123 | : : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
124 | } | ||
125 | |||
126 | #define test_and_change_bit(nr,vaddr) \ | ||
127 | (__builtin_constant_p(nr) ? \ | ||
128 | __constant_test_and_change_bit(nr, vaddr) : \ | ||
129 | __generic_test_and_change_bit(nr, vaddr)) | ||
130 | |||
131 | #define __test_and_change_bit(nr,vaddr) test_and_change_bit(nr,vaddr) | ||
132 | #define __change_bit(nr,vaddr) change_bit(nr,vaddr) | ||
133 | |||
134 | static inline int __constant_test_and_change_bit(int nr, unsigned long *vaddr) | ||
135 | { | ||
136 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
137 | char retval; | ||
138 | |||
139 | __asm__ __volatile__ ("bchg %2,%1; sne %0" | ||
140 | : "=d" (retval), "+m" (*p) | ||
141 | : "di" (nr & 7)); | ||
142 | |||
143 | return retval; | ||
144 | } | ||
145 | |||
146 | static inline int __generic_test_and_change_bit(int nr, unsigned long *vaddr) | ||
147 | { | ||
148 | char retval; | ||
149 | |||
150 | __asm__ __volatile__ ("bfchg %2{%1:#1}; sne %0" | ||
151 | : "=d" (retval) : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
152 | |||
153 | return retval; | ||
154 | } | ||
155 | |||
156 | #define change_bit(nr,vaddr) \ | ||
157 | (__builtin_constant_p(nr) ? \ | ||
158 | __constant_change_bit(nr, vaddr) : \ | ||
159 | __generic_change_bit(nr, vaddr)) | ||
160 | |||
161 | static inline void __constant_change_bit(int nr, unsigned long *vaddr) | ||
162 | { | ||
163 | char *p = (char *)vaddr + (nr ^ 31) / 8; | ||
164 | __asm__ __volatile__ ("bchg %1,%0" | ||
165 | : "+m" (*p) : "di" (nr & 7)); | ||
166 | } | ||
167 | |||
168 | static inline void __generic_change_bit(int nr, unsigned long *vaddr) | ||
169 | { | ||
170 | __asm__ __volatile__ ("bfchg %1{%0:#1}" | ||
171 | : : "d" (nr^31), "o" (*vaddr) : "memory"); | ||
172 | } | ||
173 | |||
174 | static inline int test_bit(int nr, const unsigned long *vaddr) | ||
175 | { | ||
176 | return (vaddr[nr >> 5] & (1UL << (nr & 31))) != 0; | ||
177 | } | ||
178 | |||
179 | static inline int find_first_zero_bit(const unsigned long *vaddr, | ||
180 | unsigned size) | ||
181 | { | ||
182 | const unsigned long *p = vaddr; | ||
183 | int res = 32; | ||
184 | unsigned long num; | ||
185 | |||
186 | if (!size) | ||
187 | return 0; | ||
188 | |||
189 | size = (size + 31) >> 5; | ||
190 | while (!(num = ~*p++)) { | ||
191 | if (!--size) | ||
192 | goto out; | ||
193 | } | ||
194 | |||
195 | __asm__ __volatile__ ("bfffo %1{#0,#0},%0" | ||
196 | : "=d" (res) : "d" (num & -num)); | ||
197 | res ^= 31; | ||
198 | out: | ||
199 | return ((long)p - (long)vaddr - 4) * 8 + res; | ||
200 | } | ||
201 | |||
202 | static inline int find_next_zero_bit(const unsigned long *vaddr, int size, | ||
203 | int offset) | ||
204 | { | ||
205 | const unsigned long *p = vaddr + (offset >> 5); | ||
206 | int bit = offset & 31UL, res; | ||
207 | |||
208 | if (offset >= size) | ||
209 | return size; | ||
210 | |||
211 | if (bit) { | ||
212 | unsigned long num = ~*p++ & (~0UL << bit); | ||
213 | offset -= bit; | ||
214 | |||
215 | /* Look for zero in first longword */ | ||
216 | __asm__ __volatile__ ("bfffo %1{#0,#0},%0" | ||
217 | : "=d" (res) : "d" (num & -num)); | ||
218 | if (res < 32) | ||
219 | return offset + (res ^ 31); | ||
220 | offset += 32; | ||
221 | } | ||
222 | /* No zero yet, search remaining full bytes for a zero */ | ||
223 | res = find_first_zero_bit(p, size - ((long)p - (long)vaddr) * 8); | ||
224 | return offset + res; | ||
225 | } | ||
226 | |||
227 | static inline int find_first_bit(const unsigned long *vaddr, unsigned size) | ||
228 | { | ||
229 | const unsigned long *p = vaddr; | ||
230 | int res = 32; | ||
231 | unsigned long num; | ||
232 | |||
233 | if (!size) | ||
234 | return 0; | ||
235 | |||
236 | size = (size + 31) >> 5; | ||
237 | while (!(num = *p++)) { | ||
238 | if (!--size) | ||
239 | goto out; | ||
240 | } | ||
241 | |||
242 | __asm__ __volatile__ ("bfffo %1{#0,#0},%0" | ||
243 | : "=d" (res) : "d" (num & -num)); | ||
244 | res ^= 31; | ||
245 | out: | ||
246 | return ((long)p - (long)vaddr - 4) * 8 + res; | ||
247 | } | ||
248 | |||
249 | static inline int find_next_bit(const unsigned long *vaddr, int size, | ||
250 | int offset) | ||
251 | { | ||
252 | const unsigned long *p = vaddr + (offset >> 5); | ||
253 | int bit = offset & 31UL, res; | ||
254 | |||
255 | if (offset >= size) | ||
256 | return size; | ||
257 | |||
258 | if (bit) { | ||
259 | unsigned long num = *p++ & (~0UL << bit); | ||
260 | offset -= bit; | ||
261 | |||
262 | /* Look for one in first longword */ | ||
263 | __asm__ __volatile__ ("bfffo %1{#0,#0},%0" | ||
264 | : "=d" (res) : "d" (num & -num)); | ||
265 | if (res < 32) | ||
266 | return offset + (res ^ 31); | ||
267 | offset += 32; | ||
268 | } | ||
269 | /* No one yet, search remaining full bytes for a one */ | ||
270 | res = find_first_bit(p, size - ((long)p - (long)vaddr) * 8); | ||
271 | return offset + res; | ||
272 | } | ||
273 | |||
274 | /* | ||
275 | * ffz = Find First Zero in word. Undefined if no zero exists, | ||
276 | * so code should check against ~0UL first.. | ||
277 | */ | ||
278 | static inline unsigned long ffz(unsigned long word) | ||
279 | { | ||
280 | int res; | ||
281 | |||
282 | __asm__ __volatile__ ("bfffo %1{#0,#0},%0" | ||
283 | : "=d" (res) : "d" (~word & -~word)); | ||
284 | return res ^ 31; | ||
285 | } | ||
286 | |||
287 | #ifdef __KERNEL__ | ||
288 | |||
289 | /* | ||
290 | * ffs: find first bit set. This is defined the same way as | ||
291 | * the libc and compiler builtin ffs routines, therefore | ||
292 | * differs in spirit from the above ffz (man ffs). | ||
293 | */ | ||
294 | |||
295 | static inline int ffs(int x) | ||
296 | { | ||
297 | int cnt; | ||
298 | |||
299 | asm ("bfffo %1{#0:#0},%0" : "=d" (cnt) : "dm" (x & -x)); | ||
300 | |||
301 | return 32 - cnt; | ||
302 | } | ||
303 | #define __ffs(x) (ffs(x) - 1) | ||
304 | |||
305 | /* | ||
306 | * fls: find last bit set. | ||
307 | */ | ||
308 | |||
309 | static inline int fls(int x) | ||
310 | { | ||
311 | int cnt; | ||
312 | |||
313 | asm ("bfffo %1{#0,#0},%0" : "=d" (cnt) : "dm" (x)); | ||
314 | |||
315 | return 32 - cnt; | ||
316 | } | ||
317 | |||
318 | static inline int __fls(int x) | ||
319 | { | ||
320 | return fls(x) - 1; | ||
321 | } | ||
322 | |||
323 | #include <asm-generic/bitops/fls64.h> | ||
324 | #include <asm-generic/bitops/sched.h> | ||
325 | #include <asm-generic/bitops/hweight.h> | ||
326 | #include <asm-generic/bitops/lock.h> | ||
327 | |||
328 | /* Bitmap functions for the minix filesystem */ | ||
329 | |||
330 | static inline int minix_find_first_zero_bit(const void *vaddr, unsigned size) | ||
331 | { | ||
332 | const unsigned short *p = vaddr, *addr = vaddr; | ||
333 | int res; | ||
334 | unsigned short num; | ||
335 | |||
336 | if (!size) | ||
337 | return 0; | ||
338 | |||
339 | size = (size >> 4) + ((size & 15) > 0); | ||
340 | while (*p++ == 0xffff) | ||
341 | { | ||
342 | if (--size == 0) | ||
343 | return (p - addr) << 4; | ||
344 | } | ||
345 | |||
346 | num = ~*--p; | ||
347 | __asm__ __volatile__ ("bfffo %1{#16,#16},%0" | ||
348 | : "=d" (res) : "d" (num & -num)); | ||
349 | return ((p - addr) << 4) + (res ^ 31); | ||
350 | } | ||
351 | |||
352 | #define minix_test_and_set_bit(nr, addr) __test_and_set_bit((nr) ^ 16, (unsigned long *)(addr)) | ||
353 | #define minix_set_bit(nr,addr) __set_bit((nr) ^ 16, (unsigned long *)(addr)) | ||
354 | #define minix_test_and_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 16, (unsigned long *)(addr)) | ||
355 | |||
356 | static inline int minix_test_bit(int nr, const void *vaddr) | ||
357 | { | ||
358 | const unsigned short *p = vaddr; | ||
359 | return (p[nr >> 4] & (1U << (nr & 15))) != 0; | ||
360 | } | ||
361 | |||
362 | /* Bitmap functions for the ext2 filesystem. */ | ||
363 | |||
364 | #define ext2_set_bit(nr, addr) __test_and_set_bit((nr) ^ 24, (unsigned long *)(addr)) | ||
365 | #define ext2_set_bit_atomic(lock, nr, addr) test_and_set_bit((nr) ^ 24, (unsigned long *)(addr)) | ||
366 | #define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr)) | ||
367 | #define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr)) | ||
368 | |||
369 | static inline int ext2_test_bit(int nr, const void *vaddr) | ||
370 | { | ||
371 | const unsigned char *p = vaddr; | ||
372 | return (p[nr >> 3] & (1U << (nr & 7))) != 0; | ||
373 | } | ||
374 | |||
375 | static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size) | ||
376 | { | ||
377 | const unsigned long *p = vaddr, *addr = vaddr; | ||
378 | int res; | ||
379 | |||
380 | if (!size) | ||
381 | return 0; | ||
382 | |||
383 | size = (size >> 5) + ((size & 31) > 0); | ||
384 | while (*p++ == ~0UL) | ||
385 | { | ||
386 | if (--size == 0) | ||
387 | return (p - addr) << 5; | ||
388 | } | ||
389 | |||
390 | --p; | ||
391 | for (res = 0; res < 32; res++) | ||
392 | if (!ext2_test_bit (res, p)) | ||
393 | break; | ||
394 | return (p - addr) * 32 + res; | ||
395 | } | ||
396 | |||
397 | static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size, | ||
398 | unsigned offset) | ||
399 | { | ||
400 | const unsigned long *addr = vaddr; | ||
401 | const unsigned long *p = addr + (offset >> 5); | ||
402 | int bit = offset & 31UL, res; | ||
403 | |||
404 | if (offset >= size) | ||
405 | return size; | ||
406 | |||
407 | if (bit) { | ||
408 | /* Look for zero in first longword */ | ||
409 | for (res = bit; res < 32; res++) | ||
410 | if (!ext2_test_bit (res, p)) | ||
411 | return (p - addr) * 32 + res; | ||
412 | p++; | ||
413 | } | ||
414 | /* No zero yet, search remaining full bytes for a zero */ | ||
415 | res = ext2_find_first_zero_bit (p, size - 32 * (p - addr)); | ||
416 | return (p - addr) * 32 + res; | ||
417 | } | ||
418 | |||
419 | static inline int ext2_find_first_bit(const void *vaddr, unsigned size) | ||
420 | { | ||
421 | const unsigned long *p = vaddr, *addr = vaddr; | ||
422 | int res; | ||
423 | |||
424 | if (!size) | ||
425 | return 0; | ||
426 | |||
427 | size = (size >> 5) + ((size & 31) > 0); | ||
428 | while (*p++ == 0UL) { | ||
429 | if (--size == 0) | ||
430 | return (p - addr) << 5; | ||
431 | } | ||
432 | |||
433 | --p; | ||
434 | for (res = 0; res < 32; res++) | ||
435 | if (ext2_test_bit(res, p)) | ||
436 | break; | ||
437 | return (p - addr) * 32 + res; | ||
438 | } | ||
439 | |||
440 | static inline int ext2_find_next_bit(const void *vaddr, unsigned size, | ||
441 | unsigned offset) | ||
442 | { | ||
443 | const unsigned long *addr = vaddr; | ||
444 | const unsigned long *p = addr + (offset >> 5); | ||
445 | int bit = offset & 31UL, res; | ||
446 | |||
447 | if (offset >= size) | ||
448 | return size; | ||
449 | |||
450 | if (bit) { | ||
451 | /* Look for one in first longword */ | ||
452 | for (res = bit; res < 32; res++) | ||
453 | if (ext2_test_bit(res, p)) | ||
454 | return (p - addr) * 32 + res; | ||
455 | p++; | ||
456 | } | ||
457 | /* No set bit yet, search remaining full bytes for a set bit */ | ||
458 | res = ext2_find_first_bit(p, size - 32 * (p - addr)); | ||
459 | return (p - addr) * 32 + res; | ||
460 | } | ||
461 | |||
462 | #endif /* __KERNEL__ */ | ||
463 | |||
464 | #endif /* _M68K_BITOPS_H */ | ||
diff --git a/include/asm-m68k/blinken.h b/include/asm-m68k/blinken.h deleted file mode 100644 index 1a749cf7b06d..000000000000 --- a/include/asm-m68k/blinken.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | ** asm/blinken.h -- m68k blinkenlights support (currently hp300 only) | ||
3 | ** | ||
4 | ** (c) 1998 Phil Blundell <philb@gnu.org> | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | */ | ||
11 | |||
12 | #ifndef _M68K_BLINKEN_H | ||
13 | #define _M68K_BLINKEN_H | ||
14 | |||
15 | #include <asm/setup.h> | ||
16 | #include <asm/io.h> | ||
17 | |||
18 | #define HP300_LEDS 0xf001ffff | ||
19 | |||
20 | extern unsigned char ledstate; | ||
21 | |||
22 | static __inline__ void blinken_leds(int on, int off) | ||
23 | { | ||
24 | if (MACH_IS_HP300) | ||
25 | { | ||
26 | ledstate |= on; | ||
27 | ledstate &= ~off; | ||
28 | out_8(HP300_LEDS, ~ledstate); | ||
29 | } | ||
30 | } | ||
31 | |||
32 | #endif | ||
diff --git a/include/asm-m68k/bootinfo.h b/include/asm-m68k/bootinfo.h deleted file mode 100644 index fb8a06b9ab6a..000000000000 --- a/include/asm-m68k/bootinfo.h +++ /dev/null | |||
@@ -1,378 +0,0 @@ | |||
1 | /* | ||
2 | ** asm/bootinfo.h -- Definition of the Linux/m68k boot information structure | ||
3 | ** | ||
4 | ** Copyright 1992 by Greg Harp | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | ** Created 09/29/92 by Greg Harp | ||
11 | ** | ||
12 | ** 5/2/94 Roman Hodek: | ||
13 | ** Added bi_atari part of the machine dependent union bi_un; for now it | ||
14 | ** contains just a model field to distinguish between TT and Falcon. | ||
15 | ** 26/7/96 Roman Zippel: | ||
16 | ** Renamed to setup.h; added some useful macros to allow gcc some | ||
17 | ** optimizations if possible. | ||
18 | ** 5/10/96 Geert Uytterhoeven: | ||
19 | ** Redesign of the boot information structure; renamed to bootinfo.h again | ||
20 | ** 27/11/96 Geert Uytterhoeven: | ||
21 | ** Backwards compatibility with bootinfo interface version 1.0 | ||
22 | */ | ||
23 | |||
24 | #ifndef _M68K_BOOTINFO_H | ||
25 | #define _M68K_BOOTINFO_H | ||
26 | |||
27 | |||
28 | /* | ||
29 | * Bootinfo definitions | ||
30 | * | ||
31 | * This is an easily parsable and extendable structure containing all | ||
32 | * information to be passed from the bootstrap to the kernel. | ||
33 | * | ||
34 | * This way I hope to keep all future changes back/forewards compatible. | ||
35 | * Thus, keep your fingers crossed... | ||
36 | * | ||
37 | * This structure is copied right after the kernel bss by the bootstrap | ||
38 | * routine. | ||
39 | */ | ||
40 | |||
41 | #ifndef __ASSEMBLY__ | ||
42 | |||
43 | struct bi_record { | ||
44 | unsigned short tag; /* tag ID */ | ||
45 | unsigned short size; /* size of record (in bytes) */ | ||
46 | unsigned long data[0]; /* data */ | ||
47 | }; | ||
48 | |||
49 | #endif /* __ASSEMBLY__ */ | ||
50 | |||
51 | |||
52 | /* | ||
53 | * Tag Definitions | ||
54 | * | ||
55 | * Machine independent tags start counting from 0x0000 | ||
56 | * Machine dependent tags start counting from 0x8000 | ||
57 | */ | ||
58 | |||
59 | #define BI_LAST 0x0000 /* last record (sentinel) */ | ||
60 | #define BI_MACHTYPE 0x0001 /* machine type (u_long) */ | ||
61 | #define BI_CPUTYPE 0x0002 /* cpu type (u_long) */ | ||
62 | #define BI_FPUTYPE 0x0003 /* fpu type (u_long) */ | ||
63 | #define BI_MMUTYPE 0x0004 /* mmu type (u_long) */ | ||
64 | #define BI_MEMCHUNK 0x0005 /* memory chunk address and size */ | ||
65 | /* (struct mem_info) */ | ||
66 | #define BI_RAMDISK 0x0006 /* ramdisk address and size */ | ||
67 | /* (struct mem_info) */ | ||
68 | #define BI_COMMAND_LINE 0x0007 /* kernel command line parameters */ | ||
69 | /* (string) */ | ||
70 | |||
71 | /* | ||
72 | * Amiga-specific tags | ||
73 | */ | ||
74 | |||
75 | #define BI_AMIGA_MODEL 0x8000 /* model (u_long) */ | ||
76 | #define BI_AMIGA_AUTOCON 0x8001 /* AutoConfig device */ | ||
77 | /* (struct ConfigDev) */ | ||
78 | #define BI_AMIGA_CHIP_SIZE 0x8002 /* size of Chip RAM (u_long) */ | ||
79 | #define BI_AMIGA_VBLANK 0x8003 /* VBLANK frequency (u_char) */ | ||
80 | #define BI_AMIGA_PSFREQ 0x8004 /* power supply frequency (u_char) */ | ||
81 | #define BI_AMIGA_ECLOCK 0x8005 /* EClock frequency (u_long) */ | ||
82 | #define BI_AMIGA_CHIPSET 0x8006 /* native chipset present (u_long) */ | ||
83 | #define BI_AMIGA_SERPER 0x8007 /* serial port period (u_short) */ | ||
84 | |||
85 | /* | ||
86 | * Atari-specific tags | ||
87 | */ | ||
88 | |||
89 | #define BI_ATARI_MCH_COOKIE 0x8000 /* _MCH cookie from TOS (u_long) */ | ||
90 | #define BI_ATARI_MCH_TYPE 0x8001 /* special machine type (u_long) */ | ||
91 | /* (values are ATARI_MACH_* defines */ | ||
92 | |||
93 | /* mch_cookie values (upper word) */ | ||
94 | #define ATARI_MCH_ST 0 | ||
95 | #define ATARI_MCH_STE 1 | ||
96 | #define ATARI_MCH_TT 2 | ||
97 | #define ATARI_MCH_FALCON 3 | ||
98 | |||
99 | /* mch_type values */ | ||
100 | #define ATARI_MACH_NORMAL 0 /* no special machine type */ | ||
101 | #define ATARI_MACH_MEDUSA 1 /* Medusa 040 */ | ||
102 | #define ATARI_MACH_HADES 2 /* Hades 040 or 060 */ | ||
103 | #define ATARI_MACH_AB40 3 /* Afterburner040 on Falcon */ | ||
104 | |||
105 | /* | ||
106 | * VME-specific tags | ||
107 | */ | ||
108 | |||
109 | #define BI_VME_TYPE 0x8000 /* VME sub-architecture (u_long) */ | ||
110 | #define BI_VME_BRDINFO 0x8001 /* VME board information (struct) */ | ||
111 | |||
112 | /* BI_VME_TYPE codes */ | ||
113 | #define VME_TYPE_TP34V 0x0034 /* Tadpole TP34V */ | ||
114 | #define VME_TYPE_MVME147 0x0147 /* Motorola MVME147 */ | ||
115 | #define VME_TYPE_MVME162 0x0162 /* Motorola MVME162 */ | ||
116 | #define VME_TYPE_MVME166 0x0166 /* Motorola MVME166 */ | ||
117 | #define VME_TYPE_MVME167 0x0167 /* Motorola MVME167 */ | ||
118 | #define VME_TYPE_MVME172 0x0172 /* Motorola MVME172 */ | ||
119 | #define VME_TYPE_MVME177 0x0177 /* Motorola MVME177 */ | ||
120 | #define VME_TYPE_BVME4000 0x4000 /* BVM Ltd. BVME4000 */ | ||
121 | #define VME_TYPE_BVME6000 0x6000 /* BVM Ltd. BVME6000 */ | ||
122 | |||
123 | /* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on | ||
124 | * Motorola VME boards. Contains board number, Bug version, board | ||
125 | * configuration options, etc. See include/asm/mvme16xhw.h for details. | ||
126 | */ | ||
127 | |||
128 | |||
129 | /* | ||
130 | * Macintosh-specific tags (all u_long) | ||
131 | */ | ||
132 | |||
133 | #define BI_MAC_MODEL 0x8000 /* Mac Gestalt ID (model type) */ | ||
134 | #define BI_MAC_VADDR 0x8001 /* Mac video base address */ | ||
135 | #define BI_MAC_VDEPTH 0x8002 /* Mac video depth */ | ||
136 | #define BI_MAC_VROW 0x8003 /* Mac video rowbytes */ | ||
137 | #define BI_MAC_VDIM 0x8004 /* Mac video dimensions */ | ||
138 | #define BI_MAC_VLOGICAL 0x8005 /* Mac video logical base */ | ||
139 | #define BI_MAC_SCCBASE 0x8006 /* Mac SCC base address */ | ||
140 | #define BI_MAC_BTIME 0x8007 /* Mac boot time */ | ||
141 | #define BI_MAC_GMTBIAS 0x8008 /* Mac GMT timezone offset */ | ||
142 | #define BI_MAC_MEMSIZE 0x8009 /* Mac RAM size (sanity check) */ | ||
143 | #define BI_MAC_CPUID 0x800a /* Mac CPU type (sanity check) */ | ||
144 | #define BI_MAC_ROMBASE 0x800b /* Mac system ROM base address */ | ||
145 | |||
146 | /* | ||
147 | * Macintosh hardware profile data - unused, see macintosh.h for | ||
148 | * resonable type values | ||
149 | */ | ||
150 | |||
151 | #define BI_MAC_VIA1BASE 0x8010 /* Mac VIA1 base address (always present) */ | ||
152 | #define BI_MAC_VIA2BASE 0x8011 /* Mac VIA2 base address (type varies) */ | ||
153 | #define BI_MAC_VIA2TYPE 0x8012 /* Mac VIA2 type (VIA, RBV, OSS) */ | ||
154 | #define BI_MAC_ADBTYPE 0x8013 /* Mac ADB interface type */ | ||
155 | #define BI_MAC_ASCBASE 0x8014 /* Mac Apple Sound Chip base address */ | ||
156 | #define BI_MAC_SCSI5380 0x8015 /* Mac NCR 5380 SCSI (base address, multi) */ | ||
157 | #define BI_MAC_SCSIDMA 0x8016 /* Mac SCSI DMA (base address) */ | ||
158 | #define BI_MAC_SCSI5396 0x8017 /* Mac NCR 53C96 SCSI (base address, multi) */ | ||
159 | #define BI_MAC_IDETYPE 0x8018 /* Mac IDE interface type */ | ||
160 | #define BI_MAC_IDEBASE 0x8019 /* Mac IDE interface base address */ | ||
161 | #define BI_MAC_NUBUS 0x801a /* Mac Nubus type (none, regular, pseudo) */ | ||
162 | #define BI_MAC_SLOTMASK 0x801b /* Mac Nubus slots present */ | ||
163 | #define BI_MAC_SCCTYPE 0x801c /* Mac SCC serial type (normal, IOP) */ | ||
164 | #define BI_MAC_ETHTYPE 0x801d /* Mac builtin ethernet type (Sonic, MACE */ | ||
165 | #define BI_MAC_ETHBASE 0x801e /* Mac builtin ethernet base address */ | ||
166 | #define BI_MAC_PMU 0x801f /* Mac power management / poweroff hardware */ | ||
167 | #define BI_MAC_IOP_SWIM 0x8020 /* Mac SWIM floppy IOP */ | ||
168 | #define BI_MAC_IOP_ADB 0x8021 /* Mac ADB IOP */ | ||
169 | |||
170 | /* | ||
171 | * Mac: compatibility with old booter data format (temporarily) | ||
172 | * Fields unused with the new bootinfo can be deleted now; instead of | ||
173 | * adding new fields the struct might be splitted into a hardware address | ||
174 | * part and a hardware type part | ||
175 | */ | ||
176 | |||
177 | #ifndef __ASSEMBLY__ | ||
178 | |||
179 | struct mac_booter_data | ||
180 | { | ||
181 | unsigned long videoaddr; | ||
182 | unsigned long videorow; | ||
183 | unsigned long videodepth; | ||
184 | unsigned long dimensions; | ||
185 | unsigned long args; | ||
186 | unsigned long boottime; | ||
187 | unsigned long gmtbias; | ||
188 | unsigned long bootver; | ||
189 | unsigned long videological; | ||
190 | unsigned long sccbase; | ||
191 | unsigned long id; | ||
192 | unsigned long memsize; | ||
193 | unsigned long serialmf; | ||
194 | unsigned long serialhsk; | ||
195 | unsigned long serialgpi; | ||
196 | unsigned long printmf; | ||
197 | unsigned long printhsk; | ||
198 | unsigned long printgpi; | ||
199 | unsigned long cpuid; | ||
200 | unsigned long rombase; | ||
201 | unsigned long adbdelay; | ||
202 | unsigned long timedbra; | ||
203 | }; | ||
204 | |||
205 | extern struct mac_booter_data | ||
206 | mac_bi_data; | ||
207 | |||
208 | #endif | ||
209 | |||
210 | /* | ||
211 | * Apollo-specific tags | ||
212 | */ | ||
213 | |||
214 | #define BI_APOLLO_MODEL 0x8000 /* model (u_long) */ | ||
215 | |||
216 | /* | ||
217 | * HP300-specific tags | ||
218 | */ | ||
219 | |||
220 | #define BI_HP300_MODEL 0x8000 /* model (u_long) */ | ||
221 | #define BI_HP300_UART_SCODE 0x8001 /* UART select code (u_long) */ | ||
222 | #define BI_HP300_UART_ADDR 0x8002 /* phys. addr of UART (u_long) */ | ||
223 | |||
224 | /* | ||
225 | * Stuff for bootinfo interface versioning | ||
226 | * | ||
227 | * At the start of kernel code, a 'struct bootversion' is located. | ||
228 | * bootstrap checks for a matching version of the interface before booting | ||
229 | * a kernel, to avoid user confusion if kernel and bootstrap don't work | ||
230 | * together :-) | ||
231 | * | ||
232 | * If incompatible changes are made to the bootinfo interface, the major | ||
233 | * number below should be stepped (and the minor reset to 0) for the | ||
234 | * appropriate machine. If a change is backward-compatible, the minor | ||
235 | * should be stepped. "Backwards-compatible" means that booting will work, | ||
236 | * but certain features may not. | ||
237 | */ | ||
238 | |||
239 | #define BOOTINFOV_MAGIC 0x4249561A /* 'BIV^Z' */ | ||
240 | #define MK_BI_VERSION(major,minor) (((major)<<16)+(minor)) | ||
241 | #define BI_VERSION_MAJOR(v) (((v) >> 16) & 0xffff) | ||
242 | #define BI_VERSION_MINOR(v) ((v) & 0xffff) | ||
243 | |||
244 | #ifndef __ASSEMBLY__ | ||
245 | |||
246 | struct bootversion { | ||
247 | unsigned short branch; | ||
248 | unsigned long magic; | ||
249 | struct { | ||
250 | unsigned long machtype; | ||
251 | unsigned long version; | ||
252 | } machversions[0]; | ||
253 | }; | ||
254 | |||
255 | #endif /* __ASSEMBLY__ */ | ||
256 | |||
257 | #define AMIGA_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
258 | #define ATARI_BOOTI_VERSION MK_BI_VERSION( 2, 1 ) | ||
259 | #define MAC_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
260 | #define MVME147_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
261 | #define MVME16x_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
262 | #define BVME6000_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
263 | #define Q40_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
264 | #define HP300_BOOTI_VERSION MK_BI_VERSION( 2, 0 ) | ||
265 | |||
266 | #ifdef BOOTINFO_COMPAT_1_0 | ||
267 | |||
268 | /* | ||
269 | * Backwards compatibility with bootinfo interface version 1.0 | ||
270 | */ | ||
271 | |||
272 | #define COMPAT_AMIGA_BOOTI_VERSION MK_BI_VERSION( 1, 0 ) | ||
273 | #define COMPAT_ATARI_BOOTI_VERSION MK_BI_VERSION( 1, 0 ) | ||
274 | #define COMPAT_MAC_BOOTI_VERSION MK_BI_VERSION( 1, 0 ) | ||
275 | |||
276 | #include <linux/zorro.h> | ||
277 | |||
278 | #define COMPAT_NUM_AUTO 16 | ||
279 | |||
280 | struct compat_bi_Amiga { | ||
281 | int model; | ||
282 | int num_autocon; | ||
283 | struct ConfigDev autocon[COMPAT_NUM_AUTO]; | ||
284 | unsigned long chip_size; | ||
285 | unsigned char vblank; | ||
286 | unsigned char psfreq; | ||
287 | unsigned long eclock; | ||
288 | unsigned long chipset; | ||
289 | unsigned long hw_present; | ||
290 | }; | ||
291 | |||
292 | struct compat_bi_Atari { | ||
293 | unsigned long hw_present; | ||
294 | unsigned long mch_cookie; | ||
295 | }; | ||
296 | |||
297 | #ifndef __ASSEMBLY__ | ||
298 | |||
299 | struct compat_bi_Macintosh | ||
300 | { | ||
301 | unsigned long videoaddr; | ||
302 | unsigned long videorow; | ||
303 | unsigned long videodepth; | ||
304 | unsigned long dimensions; | ||
305 | unsigned long args; | ||
306 | unsigned long boottime; | ||
307 | unsigned long gmtbias; | ||
308 | unsigned long bootver; | ||
309 | unsigned long videological; | ||
310 | unsigned long sccbase; | ||
311 | unsigned long id; | ||
312 | unsigned long memsize; | ||
313 | unsigned long serialmf; | ||
314 | unsigned long serialhsk; | ||
315 | unsigned long serialgpi; | ||
316 | unsigned long printmf; | ||
317 | unsigned long printhsk; | ||
318 | unsigned long printgpi; | ||
319 | unsigned long cpuid; | ||
320 | unsigned long rombase; | ||
321 | unsigned long adbdelay; | ||
322 | unsigned long timedbra; | ||
323 | }; | ||
324 | |||
325 | #endif | ||
326 | |||
327 | struct compat_mem_info { | ||
328 | unsigned long addr; | ||
329 | unsigned long size; | ||
330 | }; | ||
331 | |||
332 | #define COMPAT_NUM_MEMINFO 4 | ||
333 | |||
334 | #define COMPAT_CPUB_68020 0 | ||
335 | #define COMPAT_CPUB_68030 1 | ||
336 | #define COMPAT_CPUB_68040 2 | ||
337 | #define COMPAT_CPUB_68060 3 | ||
338 | #define COMPAT_FPUB_68881 5 | ||
339 | #define COMPAT_FPUB_68882 6 | ||
340 | #define COMPAT_FPUB_68040 7 | ||
341 | #define COMPAT_FPUB_68060 8 | ||
342 | |||
343 | #define COMPAT_CPU_68020 (1<<COMPAT_CPUB_68020) | ||
344 | #define COMPAT_CPU_68030 (1<<COMPAT_CPUB_68030) | ||
345 | #define COMPAT_CPU_68040 (1<<COMPAT_CPUB_68040) | ||
346 | #define COMPAT_CPU_68060 (1<<COMPAT_CPUB_68060) | ||
347 | #define COMPAT_CPU_MASK (31) | ||
348 | #define COMPAT_FPU_68881 (1<<COMPAT_FPUB_68881) | ||
349 | #define COMPAT_FPU_68882 (1<<COMPAT_FPUB_68882) | ||
350 | #define COMPAT_FPU_68040 (1<<COMPAT_FPUB_68040) | ||
351 | #define COMPAT_FPU_68060 (1<<COMPAT_FPUB_68060) | ||
352 | #define COMPAT_FPU_MASK (0xfe0) | ||
353 | |||
354 | #define COMPAT_CL_SIZE (256) | ||
355 | |||
356 | struct compat_bootinfo { | ||
357 | unsigned long machtype; | ||
358 | unsigned long cputype; | ||
359 | struct compat_mem_info memory[COMPAT_NUM_MEMINFO]; | ||
360 | int num_memory; | ||
361 | unsigned long ramdisk_size; | ||
362 | unsigned long ramdisk_addr; | ||
363 | char command_line[COMPAT_CL_SIZE]; | ||
364 | union { | ||
365 | struct compat_bi_Amiga bi_ami; | ||
366 | struct compat_bi_Atari bi_ata; | ||
367 | struct compat_bi_Macintosh bi_mac; | ||
368 | } bi_un; | ||
369 | }; | ||
370 | |||
371 | #define bi_amiga bi_un.bi_ami | ||
372 | #define bi_atari bi_un.bi_ata | ||
373 | #define bi_mac bi_un.bi_mac | ||
374 | |||
375 | #endif /* BOOTINFO_COMPAT_1_0 */ | ||
376 | |||
377 | |||
378 | #endif /* _M68K_BOOTINFO_H */ | ||
diff --git a/include/asm-m68k/bug.h b/include/asm-m68k/bug.h deleted file mode 100644 index e5b528deb8a8..000000000000 --- a/include/asm-m68k/bug.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | #ifndef _M68K_BUG_H | ||
2 | #define _M68K_BUG_H | ||
3 | |||
4 | |||
5 | #ifdef CONFIG_BUG | ||
6 | #ifdef CONFIG_DEBUG_BUGVERBOSE | ||
7 | #ifndef CONFIG_SUN3 | ||
8 | #define BUG() do { \ | ||
9 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ | ||
10 | __builtin_trap(); \ | ||
11 | } while (0) | ||
12 | #else | ||
13 | #define BUG() do { \ | ||
14 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ | ||
15 | panic("BUG!"); \ | ||
16 | } while (0) | ||
17 | #endif | ||
18 | #else | ||
19 | #define BUG() do { \ | ||
20 | __builtin_trap(); \ | ||
21 | } while (0) | ||
22 | #endif | ||
23 | |||
24 | #define HAVE_ARCH_BUG | ||
25 | #endif | ||
26 | |||
27 | #include <asm-generic/bug.h> | ||
28 | |||
29 | #endif | ||
diff --git a/include/asm-m68k/bugs.h b/include/asm-m68k/bugs.h deleted file mode 100644 index d01935592410..000000000000 --- a/include/asm-m68k/bugs.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-m68k/bugs.h | ||
3 | * | ||
4 | * Copyright (C) 1994 Linus Torvalds | ||
5 | */ | ||
6 | |||
7 | /* | ||
8 | * This is included by init/main.c to check for architecture-dependent bugs. | ||
9 | * | ||
10 | * Needs: | ||
11 | * void check_bugs(void); | ||
12 | */ | ||
13 | |||
14 | extern void check_bugs(void); /* in arch/m68k/kernel/setup.c */ | ||
diff --git a/include/asm-m68k/bvme6000hw.h b/include/asm-m68k/bvme6000hw.h deleted file mode 100644 index f40d2f8510ee..000000000000 --- a/include/asm-m68k/bvme6000hw.h +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | #ifndef _M68K_BVME6000HW_H_ | ||
2 | #define _M68K_BVME6000HW_H_ | ||
3 | |||
4 | #include <asm/irq.h> | ||
5 | |||
6 | /* | ||
7 | * PIT structure | ||
8 | */ | ||
9 | |||
10 | #define BVME_PIT_BASE 0xffa00000 | ||
11 | |||
12 | typedef struct { | ||
13 | unsigned char | ||
14 | pad_a[3], pgcr, | ||
15 | pad_b[3], psrr, | ||
16 | pad_c[3], paddr, | ||
17 | pad_d[3], pbddr, | ||
18 | pad_e[3], pcddr, | ||
19 | pad_f[3], pivr, | ||
20 | pad_g[3], pacr, | ||
21 | pad_h[3], pbcr, | ||
22 | pad_i[3], padr, | ||
23 | pad_j[3], pbdr, | ||
24 | pad_k[3], paar, | ||
25 | pad_l[3], pbar, | ||
26 | pad_m[3], pcdr, | ||
27 | pad_n[3], psr, | ||
28 | pad_o[3], res1, | ||
29 | pad_p[3], res2, | ||
30 | pad_q[3], tcr, | ||
31 | pad_r[3], tivr, | ||
32 | pad_s[3], res3, | ||
33 | pad_t[3], cprh, | ||
34 | pad_u[3], cprm, | ||
35 | pad_v[3], cprl, | ||
36 | pad_w[3], res4, | ||
37 | pad_x[3], crh, | ||
38 | pad_y[3], crm, | ||
39 | pad_z[3], crl, | ||
40 | pad_A[3], tsr, | ||
41 | pad_B[3], res5; | ||
42 | } PitRegs_t, *PitRegsPtr; | ||
43 | |||
44 | #define bvmepit ((*(volatile PitRegsPtr)(BVME_PIT_BASE))) | ||
45 | |||
46 | #define BVME_RTC_BASE 0xff900000 | ||
47 | |||
48 | typedef struct { | ||
49 | unsigned char | ||
50 | pad_a[3], msr, | ||
51 | pad_b[3], t0cr_rtmr, | ||
52 | pad_c[3], t1cr_omr, | ||
53 | pad_d[3], pfr_icr0, | ||
54 | pad_e[3], irr_icr1, | ||
55 | pad_f[3], bcd_tenms, | ||
56 | pad_g[3], bcd_sec, | ||
57 | pad_h[3], bcd_min, | ||
58 | pad_i[3], bcd_hr, | ||
59 | pad_j[3], bcd_dom, | ||
60 | pad_k[3], bcd_mth, | ||
61 | pad_l[3], bcd_year, | ||
62 | pad_m[3], bcd_ujcc, | ||
63 | pad_n[3], bcd_hjcc, | ||
64 | pad_o[3], bcd_dow, | ||
65 | pad_p[3], t0lsb, | ||
66 | pad_q[3], t0msb, | ||
67 | pad_r[3], t1lsb, | ||
68 | pad_s[3], t1msb, | ||
69 | pad_t[3], cmp_sec, | ||
70 | pad_u[3], cmp_min, | ||
71 | pad_v[3], cmp_hr, | ||
72 | pad_w[3], cmp_dom, | ||
73 | pad_x[3], cmp_mth, | ||
74 | pad_y[3], cmp_dow, | ||
75 | pad_z[3], sav_sec, | ||
76 | pad_A[3], sav_min, | ||
77 | pad_B[3], sav_hr, | ||
78 | pad_C[3], sav_dom, | ||
79 | pad_D[3], sav_mth, | ||
80 | pad_E[3], ram, | ||
81 | pad_F[3], test; | ||
82 | } RtcRegs_t, *RtcPtr_t; | ||
83 | |||
84 | |||
85 | #define BVME_I596_BASE 0xff100000 | ||
86 | |||
87 | #define BVME_ETHIRQ_REG 0xff20000b | ||
88 | |||
89 | #define BVME_LOCAL_IRQ_STAT 0xff20000f | ||
90 | |||
91 | #define BVME_ETHERR 0x02 | ||
92 | #define BVME_ABORT_STATUS 0x08 | ||
93 | |||
94 | #define BVME_NCR53C710_BASE 0xff000000 | ||
95 | |||
96 | #define BVME_SCC_A_ADDR 0xffb0000b | ||
97 | #define BVME_SCC_B_ADDR 0xffb00003 | ||
98 | #define BVME_SCC_RTxC 7372800 | ||
99 | |||
100 | #define BVME_CONFIG_REG 0xff500003 | ||
101 | |||
102 | #define config_reg_ptr (volatile unsigned char *)BVME_CONFIG_REG | ||
103 | |||
104 | #define BVME_CONFIG_SW1 0x08 | ||
105 | #define BVME_CONFIG_SW2 0x04 | ||
106 | #define BVME_CONFIG_SW3 0x02 | ||
107 | #define BVME_CONFIG_SW4 0x01 | ||
108 | |||
109 | |||
110 | #define BVME_IRQ_TYPE_PRIO 0 | ||
111 | |||
112 | #define BVME_IRQ_PRN (IRQ_USER+20) | ||
113 | #define BVME_IRQ_TIMER (IRQ_USER+25) | ||
114 | #define BVME_IRQ_I596 IRQ_AUTO_2 | ||
115 | #define BVME_IRQ_SCSI IRQ_AUTO_3 | ||
116 | #define BVME_IRQ_RTC IRQ_AUTO_6 | ||
117 | #define BVME_IRQ_ABORT IRQ_AUTO_7 | ||
118 | |||
119 | /* SCC interrupts */ | ||
120 | #define BVME_IRQ_SCC_BASE IRQ_USER | ||
121 | #define BVME_IRQ_SCCB_TX IRQ_USER | ||
122 | #define BVME_IRQ_SCCB_STAT (IRQ_USER+2) | ||
123 | #define BVME_IRQ_SCCB_RX (IRQ_USER+4) | ||
124 | #define BVME_IRQ_SCCB_SPCOND (IRQ_USER+6) | ||
125 | #define BVME_IRQ_SCCA_TX (IRQ_USER+8) | ||
126 | #define BVME_IRQ_SCCA_STAT (IRQ_USER+10) | ||
127 | #define BVME_IRQ_SCCA_RX (IRQ_USER+12) | ||
128 | #define BVME_IRQ_SCCA_SPCOND (IRQ_USER+14) | ||
129 | |||
130 | /* Address control registers */ | ||
131 | |||
132 | #define BVME_ACR_A32VBA 0xff400003 | ||
133 | #define BVME_ACR_A32MSK 0xff410003 | ||
134 | #define BVME_ACR_A24VBA 0xff420003 | ||
135 | #define BVME_ACR_A24MSK 0xff430003 | ||
136 | #define BVME_ACR_A16VBA 0xff440003 | ||
137 | #define BVME_ACR_A32LBA 0xff450003 | ||
138 | #define BVME_ACR_A24LBA 0xff460003 | ||
139 | #define BVME_ACR_ADDRCTL 0xff470003 | ||
140 | |||
141 | #define bvme_acr_a32vba *(volatile unsigned char *)BVME_ACR_A32VBA | ||
142 | #define bvme_acr_a32msk *(volatile unsigned char *)BVME_ACR_A32MSK | ||
143 | #define bvme_acr_a24vba *(volatile unsigned char *)BVME_ACR_A24VBA | ||
144 | #define bvme_acr_a24msk *(volatile unsigned char *)BVME_ACR_A24MSK | ||
145 | #define bvme_acr_a16vba *(volatile unsigned char *)BVME_ACR_A16VBA | ||
146 | #define bvme_acr_a32lba *(volatile unsigned char *)BVME_ACR_A32LBA | ||
147 | #define bvme_acr_a24lba *(volatile unsigned char *)BVME_ACR_A24LBA | ||
148 | #define bvme_acr_addrctl *(volatile unsigned char *)BVME_ACR_ADDRCTL | ||
149 | |||
150 | #endif | ||
diff --git a/include/asm-m68k/byteorder.h b/include/asm-m68k/byteorder.h deleted file mode 100644 index 300866523b86..000000000000 --- a/include/asm-m68k/byteorder.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef _M68K_BYTEORDER_H | ||
2 | #define _M68K_BYTEORDER_H | ||
3 | |||
4 | #include <asm/swab.h> | ||
5 | #include <linux/byteorder/big_endian.h> | ||
6 | |||
7 | #endif /* _M68K_BYTEORDER_H */ | ||
diff --git a/include/asm-m68k/cache.h b/include/asm-m68k/cache.h deleted file mode 100644 index fed3fd30de7e..000000000000 --- a/include/asm-m68k/cache.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-m68k/cache.h | ||
3 | */ | ||
4 | #ifndef __ARCH_M68K_CACHE_H | ||
5 | #define __ARCH_M68K_CACHE_H | ||
6 | |||
7 | /* bytes per L1 cache line */ | ||
8 | #define L1_CACHE_SHIFT 4 | ||
9 | #define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT) | ||
10 | |||
11 | #endif | ||
diff --git a/include/asm-m68k/cachectl.h b/include/asm-m68k/cachectl.h deleted file mode 100644 index 525978e959e3..000000000000 --- a/include/asm-m68k/cachectl.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #ifndef _M68K_CACHECTL_H | ||
2 | #define _M68K_CACHECTL_H | ||
3 | |||
4 | /* Definitions for the cacheflush system call. */ | ||
5 | |||
6 | #define FLUSH_SCOPE_LINE 1 /* Flush a cache line */ | ||
7 | #define FLUSH_SCOPE_PAGE 2 /* Flush a page */ | ||
8 | #define FLUSH_SCOPE_ALL 3 /* Flush the whole cache -- superuser only */ | ||
9 | |||
10 | #define FLUSH_CACHE_DATA 1 /* Writeback and flush data cache */ | ||
11 | #define FLUSH_CACHE_INSN 2 /* Flush instruction cache */ | ||
12 | #define FLUSH_CACHE_BOTH 3 /* Flush both caches */ | ||
13 | |||
14 | #endif /* _M68K_CACHECTL_H */ | ||
diff --git a/include/asm-m68k/cacheflush.h b/include/asm-m68k/cacheflush.h deleted file mode 100644 index 16bf375fdbe1..000000000000 --- a/include/asm-m68k/cacheflush.h +++ /dev/null | |||
@@ -1,156 +0,0 @@ | |||
1 | #ifndef _M68K_CACHEFLUSH_H | ||
2 | #define _M68K_CACHEFLUSH_H | ||
3 | |||
4 | #include <linux/mm.h> | ||
5 | |||
6 | /* cache code */ | ||
7 | #define FLUSH_I_AND_D (0x00000808) | ||
8 | #define FLUSH_I (0x00000008) | ||
9 | |||
10 | /* | ||
11 | * Cache handling functions | ||
12 | */ | ||
13 | |||
14 | static inline void flush_icache(void) | ||
15 | { | ||
16 | if (CPU_IS_040_OR_060) | ||
17 | asm volatile ( "nop\n" | ||
18 | " .chip 68040\n" | ||
19 | " cpusha %bc\n" | ||
20 | " .chip 68k"); | ||
21 | else { | ||
22 | unsigned long tmp; | ||
23 | asm volatile ( "movec %%cacr,%0\n" | ||
24 | " or.w %1,%0\n" | ||
25 | " movec %0,%%cacr" | ||
26 | : "=&d" (tmp) | ||
27 | : "id" (FLUSH_I)); | ||
28 | } | ||
29 | } | ||
30 | |||
31 | /* | ||
32 | * invalidate the cache for the specified memory range. | ||
33 | * It starts at the physical address specified for | ||
34 | * the given number of bytes. | ||
35 | */ | ||
36 | extern void cache_clear(unsigned long paddr, int len); | ||
37 | /* | ||
38 | * push any dirty cache in the specified memory range. | ||
39 | * It starts at the physical address specified for | ||
40 | * the given number of bytes. | ||
41 | */ | ||
42 | extern void cache_push(unsigned long paddr, int len); | ||
43 | |||
44 | /* | ||
45 | * push and invalidate pages in the specified user virtual | ||
46 | * memory range. | ||
47 | */ | ||
48 | extern void cache_push_v(unsigned long vaddr, int len); | ||
49 | |||
50 | /* This is needed whenever the virtual mapping of the current | ||
51 | process changes. */ | ||
52 | #define __flush_cache_all() \ | ||
53 | ({ \ | ||
54 | if (CPU_IS_040_OR_060) \ | ||
55 | __asm__ __volatile__("nop\n\t" \ | ||
56 | ".chip 68040\n\t" \ | ||
57 | "cpusha %dc\n\t" \ | ||
58 | ".chip 68k"); \ | ||
59 | else { \ | ||
60 | unsigned long _tmp; \ | ||
61 | __asm__ __volatile__("movec %%cacr,%0\n\t" \ | ||
62 | "orw %1,%0\n\t" \ | ||
63 | "movec %0,%%cacr" \ | ||
64 | : "=&d" (_tmp) \ | ||
65 | : "di" (FLUSH_I_AND_D)); \ | ||
66 | } \ | ||
67 | }) | ||
68 | |||
69 | #define __flush_cache_030() \ | ||
70 | ({ \ | ||
71 | if (CPU_IS_020_OR_030) { \ | ||
72 | unsigned long _tmp; \ | ||
73 | __asm__ __volatile__("movec %%cacr,%0\n\t" \ | ||
74 | "orw %1,%0\n\t" \ | ||
75 | "movec %0,%%cacr" \ | ||
76 | : "=&d" (_tmp) \ | ||
77 | : "di" (FLUSH_I_AND_D)); \ | ||
78 | } \ | ||
79 | }) | ||
80 | |||
81 | #define flush_cache_all() __flush_cache_all() | ||
82 | |||
83 | #define flush_cache_vmap(start, end) flush_cache_all() | ||
84 | #define flush_cache_vunmap(start, end) flush_cache_all() | ||
85 | |||
86 | static inline void flush_cache_mm(struct mm_struct *mm) | ||
87 | { | ||
88 | if (mm == current->mm) | ||
89 | __flush_cache_030(); | ||
90 | } | ||
91 | |||
92 | #define flush_cache_dup_mm(mm) flush_cache_mm(mm) | ||
93 | |||
94 | /* flush_cache_range/flush_cache_page must be macros to avoid | ||
95 | a dependency on linux/mm.h, which includes this file... */ | ||
96 | static inline void flush_cache_range(struct vm_area_struct *vma, | ||
97 | unsigned long start, | ||
98 | unsigned long end) | ||
99 | { | ||
100 | if (vma->vm_mm == current->mm) | ||
101 | __flush_cache_030(); | ||
102 | } | ||
103 | |||
104 | static inline void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long pfn) | ||
105 | { | ||
106 | if (vma->vm_mm == current->mm) | ||
107 | __flush_cache_030(); | ||
108 | } | ||
109 | |||
110 | |||
111 | /* Push the page at kernel virtual address and clear the icache */ | ||
112 | /* RZ: use cpush %bc instead of cpush %dc, cinv %ic */ | ||
113 | static inline void __flush_page_to_ram(void *vaddr) | ||
114 | { | ||
115 | if (CPU_IS_040_OR_060) { | ||
116 | __asm__ __volatile__("nop\n\t" | ||
117 | ".chip 68040\n\t" | ||
118 | "cpushp %%bc,(%0)\n\t" | ||
119 | ".chip 68k" | ||
120 | : : "a" (__pa(vaddr))); | ||
121 | } else { | ||
122 | unsigned long _tmp; | ||
123 | __asm__ __volatile__("movec %%cacr,%0\n\t" | ||
124 | "orw %1,%0\n\t" | ||
125 | "movec %0,%%cacr" | ||
126 | : "=&d" (_tmp) | ||
127 | : "di" (FLUSH_I)); | ||
128 | } | ||
129 | } | ||
130 | |||
131 | #define flush_dcache_page(page) __flush_page_to_ram(page_address(page)) | ||
132 | #define flush_dcache_mmap_lock(mapping) do { } while (0) | ||
133 | #define flush_dcache_mmap_unlock(mapping) do { } while (0) | ||
134 | #define flush_icache_page(vma, page) __flush_page_to_ram(page_address(page)) | ||
135 | |||
136 | extern void flush_icache_user_range(struct vm_area_struct *vma, struct page *page, | ||
137 | unsigned long addr, int len); | ||
138 | extern void flush_icache_range(unsigned long address, unsigned long endaddr); | ||
139 | |||
140 | static inline void copy_to_user_page(struct vm_area_struct *vma, | ||
141 | struct page *page, unsigned long vaddr, | ||
142 | void *dst, void *src, int len) | ||
143 | { | ||
144 | flush_cache_page(vma, vaddr, page_to_pfn(page)); | ||
145 | memcpy(dst, src, len); | ||
146 | flush_icache_user_range(vma, page, vaddr, len); | ||
147 | } | ||
148 | static inline void copy_from_user_page(struct vm_area_struct *vma, | ||
149 | struct page *page, unsigned long vaddr, | ||
150 | void *dst, void *src, int len) | ||
151 | { | ||
152 | flush_cache_page(vma, vaddr, page_to_pfn(page)); | ||
153 | memcpy(dst, src, len); | ||
154 | } | ||
155 | |||
156 | #endif /* _M68K_CACHEFLUSH_H */ | ||
diff --git a/include/asm-m68k/checksum.h b/include/asm-m68k/checksum.h deleted file mode 100644 index 494f9aec37ea..000000000000 --- a/include/asm-m68k/checksum.h +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | #ifndef _M68K_CHECKSUM_H | ||
2 | #define _M68K_CHECKSUM_H | ||
3 | |||
4 | #include <linux/in6.h> | ||
5 | |||
6 | /* | ||
7 | * computes the checksum of a memory block at buff, length len, | ||
8 | * and adds in "sum" (32-bit) | ||
9 | * | ||
10 | * returns a 32-bit number suitable for feeding into itself | ||
11 | * or csum_tcpudp_magic | ||
12 | * | ||
13 | * this function must be called with even lengths, except | ||
14 | * for the last fragment, which may be odd | ||
15 | * | ||
16 | * it's best to have buff aligned on a 32-bit boundary | ||
17 | */ | ||
18 | __wsum csum_partial(const void *buff, int len, __wsum sum); | ||
19 | |||
20 | /* | ||
21 | * the same as csum_partial, but copies from src while it | ||
22 | * checksums | ||
23 | * | ||
24 | * here even more important to align src and dst on a 32-bit (or even | ||
25 | * better 64-bit) boundary | ||
26 | */ | ||
27 | |||
28 | extern __wsum csum_partial_copy_from_user(const void __user *src, | ||
29 | void *dst, | ||
30 | int len, __wsum sum, | ||
31 | int *csum_err); | ||
32 | |||
33 | extern __wsum csum_partial_copy_nocheck(const void *src, | ||
34 | void *dst, int len, | ||
35 | __wsum sum); | ||
36 | |||
37 | /* | ||
38 | * This is a version of ip_compute_csum() optimized for IP headers, | ||
39 | * which always checksum on 4 octet boundaries. | ||
40 | * | ||
41 | */ | ||
42 | static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) | ||
43 | { | ||
44 | unsigned int sum = 0; | ||
45 | unsigned long tmp; | ||
46 | |||
47 | __asm__ ("subqw #1,%2\n" | ||
48 | "1:\t" | ||
49 | "movel %1@+,%3\n\t" | ||
50 | "addxl %3,%0\n\t" | ||
51 | "dbra %2,1b\n\t" | ||
52 | "movel %0,%3\n\t" | ||
53 | "swap %3\n\t" | ||
54 | "addxw %3,%0\n\t" | ||
55 | "clrw %3\n\t" | ||
56 | "addxw %3,%0\n\t" | ||
57 | : "=d" (sum), "=&a" (iph), "=&d" (ihl), "=&d" (tmp) | ||
58 | : "0" (sum), "1" (iph), "2" (ihl) | ||
59 | : "memory"); | ||
60 | return (__force __sum16)~sum; | ||
61 | } | ||
62 | |||
63 | /* | ||
64 | * Fold a partial checksum | ||
65 | */ | ||
66 | |||
67 | static inline __sum16 csum_fold(__wsum sum) | ||
68 | { | ||
69 | unsigned int tmp = (__force u32)sum; | ||
70 | __asm__("swap %1\n\t" | ||
71 | "addw %1, %0\n\t" | ||
72 | "clrw %1\n\t" | ||
73 | "addxw %1, %0" | ||
74 | : "=&d" (sum), "=&d" (tmp) | ||
75 | : "0" (sum), "1" (tmp)); | ||
76 | return (__force __sum16)~sum; | ||
77 | } | ||
78 | |||
79 | |||
80 | static inline __wsum | ||
81 | csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, | ||
82 | unsigned short proto, __wsum sum) | ||
83 | { | ||
84 | __asm__ ("addl %2,%0\n\t" | ||
85 | "addxl %3,%0\n\t" | ||
86 | "addxl %4,%0\n\t" | ||
87 | "clrl %1\n\t" | ||
88 | "addxl %1,%0" | ||
89 | : "=&d" (sum), "=d" (saddr) | ||
90 | : "g" (daddr), "1" (saddr), "d" (len + proto), | ||
91 | "0" (sum)); | ||
92 | return sum; | ||
93 | } | ||
94 | |||
95 | |||
96 | /* | ||
97 | * computes the checksum of the TCP/UDP pseudo-header | ||
98 | * returns a 16-bit checksum, already complemented | ||
99 | */ | ||
100 | static inline __sum16 | ||
101 | csum_tcpudp_magic(__be32 saddr, __be32 daddr, unsigned short len, | ||
102 | unsigned short proto, __wsum sum) | ||
103 | { | ||
104 | return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum)); | ||
105 | } | ||
106 | |||
107 | /* | ||
108 | * this routine is used for miscellaneous IP-like checksums, mainly | ||
109 | * in icmp.c | ||
110 | */ | ||
111 | |||
112 | static inline __sum16 ip_compute_csum(const void *buff, int len) | ||
113 | { | ||
114 | return csum_fold (csum_partial(buff, len, 0)); | ||
115 | } | ||
116 | |||
117 | #define _HAVE_ARCH_IPV6_CSUM | ||
118 | static __inline__ __sum16 | ||
119 | csum_ipv6_magic(const struct in6_addr *saddr, const struct in6_addr *daddr, | ||
120 | __u32 len, unsigned short proto, __wsum sum) | ||
121 | { | ||
122 | register unsigned long tmp; | ||
123 | __asm__("addl %2@,%0\n\t" | ||
124 | "movel %2@(4),%1\n\t" | ||
125 | "addxl %1,%0\n\t" | ||
126 | "movel %2@(8),%1\n\t" | ||
127 | "addxl %1,%0\n\t" | ||
128 | "movel %2@(12),%1\n\t" | ||
129 | "addxl %1,%0\n\t" | ||
130 | "movel %3@,%1\n\t" | ||
131 | "addxl %1,%0\n\t" | ||
132 | "movel %3@(4),%1\n\t" | ||
133 | "addxl %1,%0\n\t" | ||
134 | "movel %3@(8),%1\n\t" | ||
135 | "addxl %1,%0\n\t" | ||
136 | "movel %3@(12),%1\n\t" | ||
137 | "addxl %1,%0\n\t" | ||
138 | "addxl %4,%0\n\t" | ||
139 | "clrl %1\n\t" | ||
140 | "addxl %1,%0" | ||
141 | : "=&d" (sum), "=&d" (tmp) | ||
142 | : "a" (saddr), "a" (daddr), "d" (len + proto), | ||
143 | "0" (sum)); | ||
144 | |||
145 | return csum_fold(sum); | ||
146 | } | ||
147 | |||
148 | #endif /* _M68K_CHECKSUM_H */ | ||
diff --git a/include/asm-m68k/contregs.h b/include/asm-m68k/contregs.h deleted file mode 100644 index d1ea750bddfe..000000000000 --- a/include/asm-m68k/contregs.h +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | #ifndef _M68K_CONTREGS_H | ||
2 | #define _M68K_CONTREGS_H | ||
3 | |||
4 | /* contregs.h: Addresses of registers in the ASI_CONTROL alternate address | ||
5 | * space. These are for the mmu's context register, etc. | ||
6 | * | ||
7 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | ||
8 | */ | ||
9 | |||
10 | /* 3=sun3 | ||
11 | 4=sun4 (as in sun4 sysmaint student book) | ||
12 | c=sun4c (according to davem) */ | ||
13 | |||
14 | #define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */ | ||
15 | #define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */ | ||
16 | #define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */ | ||
17 | #define AC_CONTEXT 0x30000000 /* 34c current mmu-context */ | ||
18 | #define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/ | ||
19 | #define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */ | ||
20 | #define AC_BUS_ERROR 0x60000000 /* 34 Not cleared on read, byte. */ | ||
21 | #define AC_SYNC_ERR 0x60000000 /* c fault type */ | ||
22 | #define AC_SYNC_VA 0x60000004 /* c fault virtual address */ | ||
23 | #define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */ | ||
24 | #define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */ | ||
25 | #define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */ | ||
26 | #define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */ | ||
27 | #define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */ | ||
28 | #define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */ | ||
29 | #define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */ | ||
30 | #define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/ | ||
31 | |||
32 | /* s=Swift, h=Ross_HyperSPARC, v=TI_Viking, t=Tsunami, r=Ross_Cypress */ | ||
33 | #define AC_M_PCR 0x0000 /* shv Processor Control Reg */ | ||
34 | #define AC_M_CTPR 0x0100 /* shv Context Table Pointer Reg */ | ||
35 | #define AC_M_CXR 0x0200 /* shv Context Register */ | ||
36 | #define AC_M_SFSR 0x0300 /* shv Synchronous Fault Status Reg */ | ||
37 | #define AC_M_SFAR 0x0400 /* shv Synchronous Fault Address Reg */ | ||
38 | #define AC_M_AFSR 0x0500 /* hv Asynchronous Fault Status Reg */ | ||
39 | #define AC_M_AFAR 0x0600 /* hv Asynchronous Fault Address Reg */ | ||
40 | #define AC_M_RESET 0x0700 /* hv Reset Reg */ | ||
41 | #define AC_M_RPR 0x1000 /* hv Root Pointer Reg */ | ||
42 | #define AC_M_TSUTRCR 0x1000 /* s TLB Replacement Ctrl Reg */ | ||
43 | #define AC_M_IAPTP 0x1100 /* hv Instruction Access PTP */ | ||
44 | #define AC_M_DAPTP 0x1200 /* hv Data Access PTP */ | ||
45 | #define AC_M_ITR 0x1300 /* hv Index Tag Register */ | ||
46 | #define AC_M_TRCR 0x1400 /* hv TLB Replacement Control Reg */ | ||
47 | #define AC_M_SFSRX 0x1300 /* s Synch Fault Status Reg prim */ | ||
48 | #define AC_M_SFARX 0x1400 /* s Synch Fault Address Reg prim */ | ||
49 | #define AC_M_RPR1 0x1500 /* h Root Pointer Reg (entry 2) */ | ||
50 | #define AC_M_IAPTP1 0x1600 /* h Instruction Access PTP (entry 2) */ | ||
51 | #define AC_M_DAPTP1 0x1700 /* h Data Access PTP (entry 2) */ | ||
52 | |||
53 | #endif /* _M68K_CONTREGS_H */ | ||
diff --git a/include/asm-m68k/cputime.h b/include/asm-m68k/cputime.h deleted file mode 100644 index c79c5e892305..000000000000 --- a/include/asm-m68k/cputime.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __M68K_CPUTIME_H | ||
2 | #define __M68K_CPUTIME_H | ||
3 | |||
4 | #include <asm-generic/cputime.h> | ||
5 | |||
6 | #endif /* __M68K_CPUTIME_H */ | ||
diff --git a/include/asm-m68k/current.h b/include/asm-m68k/current.h deleted file mode 100644 index 8de8f8ceda61..000000000000 --- a/include/asm-m68k/current.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_CURRENT_H | ||
2 | #define _M68K_CURRENT_H | ||
3 | |||
4 | register struct task_struct *current __asm__("%a2"); | ||
5 | |||
6 | #endif /* !(_M68K_CURRENT_H) */ | ||
diff --git a/include/asm-m68k/delay.h b/include/asm-m68k/delay.h deleted file mode 100644 index 5ed92851bc6f..000000000000 --- a/include/asm-m68k/delay.h +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | #ifndef _M68K_DELAY_H | ||
2 | #define _M68K_DELAY_H | ||
3 | |||
4 | #include <asm/param.h> | ||
5 | |||
6 | /* | ||
7 | * Copyright (C) 1994 Hamish Macdonald | ||
8 | * | ||
9 | * Delay routines, using a pre-computed "loops_per_jiffy" value. | ||
10 | */ | ||
11 | |||
12 | static inline void __delay(unsigned long loops) | ||
13 | { | ||
14 | __asm__ __volatile__ ("1: subql #1,%0; jcc 1b" | ||
15 | : "=d" (loops) : "0" (loops)); | ||
16 | } | ||
17 | |||
18 | extern void __bad_udelay(void); | ||
19 | |||
20 | /* | ||
21 | * Use only for very small delays ( < 1 msec). Should probably use a | ||
22 | * lookup table, really, as the multiplications take much too long with | ||
23 | * short delays. This is a "reasonable" implementation, though (and the | ||
24 | * first constant multiplications gets optimized away if the delay is | ||
25 | * a constant) | ||
26 | */ | ||
27 | static inline void __const_udelay(unsigned long xloops) | ||
28 | { | ||
29 | unsigned long tmp; | ||
30 | |||
31 | __asm__ ("mulul %2,%0:%1" | ||
32 | : "=d" (xloops), "=d" (tmp) | ||
33 | : "d" (xloops), "1" (loops_per_jiffy)); | ||
34 | __delay(xloops * HZ); | ||
35 | } | ||
36 | |||
37 | static inline void __udelay(unsigned long usecs) | ||
38 | { | ||
39 | __const_udelay(usecs * 4295); /* 2**32 / 1000000 */ | ||
40 | } | ||
41 | |||
42 | #define udelay(n) (__builtin_constant_p(n) ? \ | ||
43 | ((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 4295)) : \ | ||
44 | __udelay(n)) | ||
45 | |||
46 | static inline unsigned long muldiv(unsigned long a, unsigned long b, | ||
47 | unsigned long c) | ||
48 | { | ||
49 | unsigned long tmp; | ||
50 | |||
51 | __asm__ ("mulul %2,%0:%1; divul %3,%0:%1" | ||
52 | : "=d" (tmp), "=d" (a) | ||
53 | : "d" (b), "d" (c), "1" (a)); | ||
54 | return a; | ||
55 | } | ||
56 | |||
57 | #endif /* defined(_M68K_DELAY_H) */ | ||
diff --git a/include/asm-m68k/device.h b/include/asm-m68k/device.h deleted file mode 100644 index d8f9872b0e2d..000000000000 --- a/include/asm-m68k/device.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | /* | ||
2 | * Arch specific extensions to struct device | ||
3 | * | ||
4 | * This file is released under the GPLv2 | ||
5 | */ | ||
6 | #include <asm-generic/device.h> | ||
7 | |||
diff --git a/include/asm-m68k/div64.h b/include/asm-m68k/div64.h deleted file mode 100644 index 8243c931b5c0..000000000000 --- a/include/asm-m68k/div64.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | #ifndef _M68K_DIV64_H | ||
2 | #define _M68K_DIV64_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | /* n = n / base; return rem; */ | ||
7 | |||
8 | #define do_div(n, base) ({ \ | ||
9 | union { \ | ||
10 | unsigned long n32[2]; \ | ||
11 | unsigned long long n64; \ | ||
12 | } __n; \ | ||
13 | unsigned long __rem, __upper; \ | ||
14 | \ | ||
15 | __n.n64 = (n); \ | ||
16 | if ((__upper = __n.n32[0])) { \ | ||
17 | asm ("divul.l %2,%1:%0" \ | ||
18 | : "=d" (__n.n32[0]), "=d" (__upper) \ | ||
19 | : "d" (base), "0" (__n.n32[0])); \ | ||
20 | } \ | ||
21 | asm ("divu.l %2,%1:%0" \ | ||
22 | : "=d" (__n.n32[1]), "=d" (__rem) \ | ||
23 | : "d" (base), "1" (__upper), "0" (__n.n32[1])); \ | ||
24 | (n) = __n.n64; \ | ||
25 | __rem; \ | ||
26 | }) | ||
27 | |||
28 | #endif /* _M68K_DIV64_H */ | ||
diff --git a/include/asm-m68k/dma-mapping.h b/include/asm-m68k/dma-mapping.h deleted file mode 100644 index 26f505488c11..000000000000 --- a/include/asm-m68k/dma-mapping.h +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | #ifndef _M68K_DMA_MAPPING_H | ||
2 | #define _M68K_DMA_MAPPING_H | ||
3 | |||
4 | #include <asm/cache.h> | ||
5 | |||
6 | struct scatterlist; | ||
7 | |||
8 | #ifndef CONFIG_MMU_SUN3 | ||
9 | static inline int dma_supported(struct device *dev, u64 mask) | ||
10 | { | ||
11 | return 1; | ||
12 | } | ||
13 | |||
14 | static inline int dma_set_mask(struct device *dev, u64 mask) | ||
15 | { | ||
16 | return 0; | ||
17 | } | ||
18 | |||
19 | static inline int dma_get_cache_alignment(void) | ||
20 | { | ||
21 | return 1 << L1_CACHE_SHIFT; | ||
22 | } | ||
23 | |||
24 | static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr) | ||
25 | { | ||
26 | return 0; | ||
27 | } | ||
28 | |||
29 | extern void *dma_alloc_coherent(struct device *, size_t, | ||
30 | dma_addr_t *, gfp_t); | ||
31 | extern void dma_free_coherent(struct device *, size_t, | ||
32 | void *, dma_addr_t); | ||
33 | |||
34 | static inline void *dma_alloc_noncoherent(struct device *dev, size_t size, | ||
35 | dma_addr_t *handle, gfp_t flag) | ||
36 | { | ||
37 | return dma_alloc_coherent(dev, size, handle, flag); | ||
38 | } | ||
39 | static inline void dma_free_noncoherent(struct device *dev, size_t size, | ||
40 | void *addr, dma_addr_t handle) | ||
41 | { | ||
42 | dma_free_coherent(dev, size, addr, handle); | ||
43 | } | ||
44 | static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, | ||
45 | enum dma_data_direction dir) | ||
46 | { | ||
47 | /* we use coherent allocation, so not much to do here. */ | ||
48 | } | ||
49 | |||
50 | extern dma_addr_t dma_map_single(struct device *, void *, size_t, | ||
51 | enum dma_data_direction); | ||
52 | static inline void dma_unmap_single(struct device *dev, dma_addr_t addr, | ||
53 | size_t size, enum dma_data_direction dir) | ||
54 | { | ||
55 | } | ||
56 | |||
57 | extern dma_addr_t dma_map_page(struct device *, struct page *, | ||
58 | unsigned long, size_t size, | ||
59 | enum dma_data_direction); | ||
60 | static inline void dma_unmap_page(struct device *dev, dma_addr_t address, | ||
61 | size_t size, enum dma_data_direction dir) | ||
62 | { | ||
63 | } | ||
64 | |||
65 | extern int dma_map_sg(struct device *, struct scatterlist *, int, | ||
66 | enum dma_data_direction); | ||
67 | static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg, | ||
68 | int nhwentries, enum dma_data_direction dir) | ||
69 | { | ||
70 | } | ||
71 | |||
72 | extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t, | ||
73 | enum dma_data_direction); | ||
74 | extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int, | ||
75 | enum dma_data_direction); | ||
76 | |||
77 | static inline void dma_sync_single_range_for_device(struct device *dev, | ||
78 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
79 | enum dma_data_direction direction) | ||
80 | { | ||
81 | /* just sync everything for now */ | ||
82 | dma_sync_single_for_device(dev, dma_handle, offset + size, direction); | ||
83 | } | ||
84 | |||
85 | static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, | ||
86 | size_t size, enum dma_data_direction dir) | ||
87 | { | ||
88 | } | ||
89 | |||
90 | static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, | ||
91 | int nents, enum dma_data_direction dir) | ||
92 | { | ||
93 | } | ||
94 | |||
95 | static inline void dma_sync_single_range_for_cpu(struct device *dev, | ||
96 | dma_addr_t dma_handle, unsigned long offset, size_t size, | ||
97 | enum dma_data_direction direction) | ||
98 | { | ||
99 | /* just sync everything for now */ | ||
100 | dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction); | ||
101 | } | ||
102 | |||
103 | static inline int dma_mapping_error(struct device *dev, dma_addr_t handle) | ||
104 | { | ||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | #else | ||
109 | #include <asm-generic/dma-mapping-broken.h> | ||
110 | #endif | ||
111 | |||
112 | #endif /* _M68K_DMA_MAPPING_H */ | ||
diff --git a/include/asm-m68k/dma.h b/include/asm-m68k/dma.h deleted file mode 100644 index 4240fbc946f8..000000000000 --- a/include/asm-m68k/dma.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #ifndef _M68K_DMA_H | ||
2 | #define _M68K_DMA_H 1 | ||
3 | |||
4 | |||
5 | /* it's useless on the m68k, but unfortunately needed by the new | ||
6 | bootmem allocator (but this should do it for this) */ | ||
7 | #define MAX_DMA_ADDRESS PAGE_OFFSET | ||
8 | |||
9 | #define MAX_DMA_CHANNELS 8 | ||
10 | |||
11 | extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ | ||
12 | extern void free_dma(unsigned int dmanr); /* release it again */ | ||
13 | |||
14 | #define isa_dma_bridge_buggy (0) | ||
15 | |||
16 | #endif /* _M68K_DMA_H */ | ||
diff --git a/include/asm-m68k/dsp56k.h b/include/asm-m68k/dsp56k.h deleted file mode 100644 index 2d8c0c9f794b..000000000000 --- a/include/asm-m68k/dsp56k.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-m68k/dsp56k.h - defines and declarations for | ||
3 | * DSP56k device driver | ||
4 | * | ||
5 | * Copyright (C) 1996,1997 Fredrik Noring, lars brinkhoff & Tomas Berndtsson | ||
6 | * | ||
7 | * This file is subject to the terms and conditions of the GNU General Public | ||
8 | * License. See the file COPYING in the main directory of this archive | ||
9 | * for more details. | ||
10 | */ | ||
11 | |||
12 | |||
13 | /* Used for uploading DSP binary code */ | ||
14 | struct dsp56k_upload { | ||
15 | int len; | ||
16 | char __user *bin; | ||
17 | }; | ||
18 | |||
19 | /* For the DSP host flags */ | ||
20 | struct dsp56k_host_flags { | ||
21 | int dir; /* Bit field. 1 = write output bit, 0 = do nothing. | ||
22 | * 0x0000 means reading only, 0x0011 means | ||
23 | * writing the bits stored in `out' on HF0 and HF1. | ||
24 | * Note that HF2 and HF3 can only be read. | ||
25 | */ | ||
26 | int out; /* Bit field like above. */ | ||
27 | int status; /* Host register's current state is returned */ | ||
28 | }; | ||
29 | |||
30 | /* ioctl command codes */ | ||
31 | #define DSP56K_UPLOAD 1 /* Upload DSP binary program */ | ||
32 | #define DSP56K_SET_TX_WSIZE 2 /* Host transmit word size (1-4) */ | ||
33 | #define DSP56K_SET_RX_WSIZE 3 /* Host receive word size (1-4) */ | ||
34 | #define DSP56K_HOST_FLAGS 4 /* Host flag registers */ | ||
35 | #define DSP56K_HOST_CMD 5 /* Trig Host Command (0-31) */ | ||
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h deleted file mode 100644 index 890bbf7e7758..000000000000 --- a/include/asm-m68k/dvma.h +++ /dev/null | |||
@@ -1,240 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-m68k/dma.h | ||
3 | * | ||
4 | * Copyright 1995 (C) David S. Miller (davem@caip.rutgers.edu) | ||
5 | * | ||
6 | * Hacked to fit Sun3x needs by Thomas Bogendoerfer | ||
7 | */ | ||
8 | |||
9 | #ifndef __M68K_DVMA_H | ||
10 | #define __M68K_DVMA_H | ||
11 | |||
12 | |||
13 | #define DVMA_PAGE_SHIFT 13 | ||
14 | #define DVMA_PAGE_SIZE (1UL << DVMA_PAGE_SHIFT) | ||
15 | #define DVMA_PAGE_MASK (~(DVMA_PAGE_SIZE-1)) | ||
16 | #define DVMA_PAGE_ALIGN(addr) ALIGN(addr, DVMA_PAGE_SIZE) | ||
17 | |||
18 | extern void dvma_init(void); | ||
19 | extern int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, | ||
20 | int len); | ||
21 | |||
22 | #define dvma_malloc(x) dvma_malloc_align(x, 0) | ||
23 | #define dvma_map(x, y) dvma_map_align(x, y, 0) | ||
24 | #define dvma_map_vme(x, y) (dvma_map(x, y) & 0xfffff) | ||
25 | #define dvma_map_align_vme(x, y, z) (dvma_map_align (x, y, z) & 0xfffff) | ||
26 | extern unsigned long dvma_map_align(unsigned long kaddr, int len, | ||
27 | int align); | ||
28 | extern void *dvma_malloc_align(unsigned long len, unsigned long align); | ||
29 | |||
30 | extern void dvma_unmap(void *baddr); | ||
31 | extern void dvma_free(void *vaddr); | ||
32 | |||
33 | |||
34 | #ifdef CONFIG_SUN3 | ||
35 | /* sun3 dvma page support */ | ||
36 | |||
37 | /* memory and pmegs potentially reserved for dvma */ | ||
38 | #define DVMA_PMEG_START 10 | ||
39 | #define DVMA_PMEG_END 16 | ||
40 | #define DVMA_START 0xf00000 | ||
41 | #define DVMA_END 0xfe0000 | ||
42 | #define DVMA_SIZE (DVMA_END-DVMA_START) | ||
43 | #define IOMMU_TOTAL_ENTRIES 128 | ||
44 | #define IOMMU_ENTRIES 120 | ||
45 | |||
46 | /* empirical kludge -- dvma regions only seem to work right on 0x10000 | ||
47 | byte boundaries */ | ||
48 | #define DVMA_REGION_SIZE 0x10000 | ||
49 | #define DVMA_ALIGN(addr) (((addr)+DVMA_REGION_SIZE-1) & \ | ||
50 | ~(DVMA_REGION_SIZE-1)) | ||
51 | |||
52 | /* virt <-> phys conversions */ | ||
53 | #define dvma_vtop(x) ((unsigned long)(x) & 0xffffff) | ||
54 | #define dvma_ptov(x) ((unsigned long)(x) | 0xf000000) | ||
55 | #define dvma_vtovme(x) ((unsigned long)(x) & 0x00fffff) | ||
56 | #define dvma_vmetov(x) ((unsigned long)(x) | 0xff00000) | ||
57 | #define dvma_vtob(x) dvma_vtop(x) | ||
58 | #define dvma_btov(x) dvma_ptov(x) | ||
59 | |||
60 | static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, | ||
61 | int len) | ||
62 | { | ||
63 | return 0; | ||
64 | } | ||
65 | |||
66 | #else /* Sun3x */ | ||
67 | |||
68 | /* sun3x dvma page support */ | ||
69 | |||
70 | #define DVMA_START 0x0 | ||
71 | #define DVMA_END 0xf00000 | ||
72 | #define DVMA_SIZE (DVMA_END-DVMA_START) | ||
73 | #define IOMMU_TOTAL_ENTRIES 2048 | ||
74 | /* the prom takes the top meg */ | ||
75 | #define IOMMU_ENTRIES (IOMMU_TOTAL_ENTRIES - 0x80) | ||
76 | |||
77 | #define dvma_vtob(x) ((unsigned long)(x) & 0x00ffffff) | ||
78 | #define dvma_btov(x) ((unsigned long)(x) | 0xff000000) | ||
79 | |||
80 | extern int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len); | ||
81 | |||
82 | |||
83 | |||
84 | /* everything below this line is specific to dma used for the onboard | ||
85 | ESP scsi on sun3x */ | ||
86 | |||
87 | /* Structure to describe the current status of DMA registers on the Sparc */ | ||
88 | struct sparc_dma_registers { | ||
89 | __volatile__ unsigned long cond_reg; /* DMA condition register */ | ||
90 | __volatile__ unsigned long st_addr; /* Start address of this transfer */ | ||
91 | __volatile__ unsigned long cnt; /* How many bytes to transfer */ | ||
92 | __volatile__ unsigned long dma_test; /* DMA test register */ | ||
93 | }; | ||
94 | |||
95 | /* DVMA chip revisions */ | ||
96 | enum dvma_rev { | ||
97 | dvmarev0, | ||
98 | dvmaesc1, | ||
99 | dvmarev1, | ||
100 | dvmarev2, | ||
101 | dvmarev3, | ||
102 | dvmarevplus, | ||
103 | dvmahme | ||
104 | }; | ||
105 | |||
106 | #define DMA_HASCOUNT(rev) ((rev)==dvmaesc1) | ||
107 | |||
108 | /* Linux DMA information structure, filled during probe. */ | ||
109 | struct Linux_SBus_DMA { | ||
110 | struct Linux_SBus_DMA *next; | ||
111 | struct linux_sbus_device *SBus_dev; | ||
112 | struct sparc_dma_registers *regs; | ||
113 | |||
114 | /* Status, misc info */ | ||
115 | int node; /* Prom node for this DMA device */ | ||
116 | int running; /* Are we doing DMA now? */ | ||
117 | int allocated; /* Are we "owned" by anyone yet? */ | ||
118 | |||
119 | /* Transfer information. */ | ||
120 | unsigned long addr; /* Start address of current transfer */ | ||
121 | int nbytes; /* Size of current transfer */ | ||
122 | int realbytes; /* For splitting up large transfers, etc. */ | ||
123 | |||
124 | /* DMA revision */ | ||
125 | enum dvma_rev revision; | ||
126 | }; | ||
127 | |||
128 | extern struct Linux_SBus_DMA *dma_chain; | ||
129 | |||
130 | /* Broken hardware... */ | ||
131 | #define DMA_ISBROKEN(dma) ((dma)->revision == dvmarev1) | ||
132 | #define DMA_ISESC1(dma) ((dma)->revision == dvmaesc1) | ||
133 | |||
134 | /* Fields in the cond_reg register */ | ||
135 | /* First, the version identification bits */ | ||
136 | #define DMA_DEVICE_ID 0xf0000000 /* Device identification bits */ | ||
137 | #define DMA_VERS0 0x00000000 /* Sunray DMA version */ | ||
138 | #define DMA_ESCV1 0x40000000 /* DMA ESC Version 1 */ | ||
139 | #define DMA_VERS1 0x80000000 /* DMA rev 1 */ | ||
140 | #define DMA_VERS2 0xa0000000 /* DMA rev 2 */ | ||
141 | #define DMA_VERHME 0xb0000000 /* DMA hme gate array */ | ||
142 | #define DMA_VERSPLUS 0x90000000 /* DMA rev 1 PLUS */ | ||
143 | |||
144 | #define DMA_HNDL_INTR 0x00000001 /* An IRQ needs to be handled */ | ||
145 | #define DMA_HNDL_ERROR 0x00000002 /* We need to take an error */ | ||
146 | #define DMA_FIFO_ISDRAIN 0x0000000c /* The DMA FIFO is draining */ | ||
147 | #define DMA_INT_ENAB 0x00000010 /* Turn on interrupts */ | ||
148 | #define DMA_FIFO_INV 0x00000020 /* Invalidate the FIFO */ | ||
149 | #define DMA_ACC_SZ_ERR 0x00000040 /* The access size was bad */ | ||
150 | #define DMA_FIFO_STDRAIN 0x00000040 /* DMA_VERS1 Drain the FIFO */ | ||
151 | #define DMA_RST_SCSI 0x00000080 /* Reset the SCSI controller */ | ||
152 | #define DMA_RST_ENET DMA_RST_SCSI /* Reset the ENET controller */ | ||
153 | #define DMA_ST_WRITE 0x00000100 /* write from device to memory */ | ||
154 | #define DMA_ENABLE 0x00000200 /* Fire up DMA, handle requests */ | ||
155 | #define DMA_PEND_READ 0x00000400 /* DMA_VERS1/0/PLUS Pending Read */ | ||
156 | #define DMA_ESC_BURST 0x00000800 /* 1=16byte 0=32byte */ | ||
157 | #define DMA_READ_AHEAD 0x00001800 /* DMA read ahead partial longword */ | ||
158 | #define DMA_DSBL_RD_DRN 0x00001000 /* No EC drain on slave reads */ | ||
159 | #define DMA_BCNT_ENAB 0x00002000 /* If on, use the byte counter */ | ||
160 | #define DMA_TERM_CNTR 0x00004000 /* Terminal counter */ | ||
161 | #define DMA_CSR_DISAB 0x00010000 /* No FIFO drains during csr */ | ||
162 | #define DMA_SCSI_DISAB 0x00020000 /* No FIFO drains during reg */ | ||
163 | #define DMA_DSBL_WR_INV 0x00020000 /* No EC inval. on slave writes */ | ||
164 | #define DMA_ADD_ENABLE 0x00040000 /* Special ESC DVMA optimization */ | ||
165 | #define DMA_E_BURST8 0x00040000 /* ENET: SBUS r/w burst size */ | ||
166 | #define DMA_BRST_SZ 0x000c0000 /* SCSI: SBUS r/w burst size */ | ||
167 | #define DMA_BRST64 0x00080000 /* SCSI: 64byte bursts (HME on UltraSparc only) */ | ||
168 | #define DMA_BRST32 0x00040000 /* SCSI: 32byte bursts */ | ||
169 | #define DMA_BRST16 0x00000000 /* SCSI: 16byte bursts */ | ||
170 | #define DMA_BRST0 0x00080000 /* SCSI: no bursts (non-HME gate arrays) */ | ||
171 | #define DMA_ADDR_DISAB 0x00100000 /* No FIFO drains during addr */ | ||
172 | #define DMA_2CLKS 0x00200000 /* Each transfer = 2 clock ticks */ | ||
173 | #define DMA_3CLKS 0x00400000 /* Each transfer = 3 clock ticks */ | ||
174 | #define DMA_EN_ENETAUI DMA_3CLKS /* Put lance into AUI-cable mode */ | ||
175 | #define DMA_CNTR_DISAB 0x00800000 /* No IRQ when DMA_TERM_CNTR set */ | ||
176 | #define DMA_AUTO_NADDR 0x01000000 /* Use "auto nxt addr" feature */ | ||
177 | #define DMA_SCSI_ON 0x02000000 /* Enable SCSI dma */ | ||
178 | #define DMA_PARITY_OFF 0x02000000 /* HME: disable parity checking */ | ||
179 | #define DMA_LOADED_ADDR 0x04000000 /* Address has been loaded */ | ||
180 | #define DMA_LOADED_NADDR 0x08000000 /* Next address has been loaded */ | ||
181 | |||
182 | /* Values describing the burst-size property from the PROM */ | ||
183 | #define DMA_BURST1 0x01 | ||
184 | #define DMA_BURST2 0x02 | ||
185 | #define DMA_BURST4 0x04 | ||
186 | #define DMA_BURST8 0x08 | ||
187 | #define DMA_BURST16 0x10 | ||
188 | #define DMA_BURST32 0x20 | ||
189 | #define DMA_BURST64 0x40 | ||
190 | #define DMA_BURSTBITS 0x7f | ||
191 | |||
192 | /* Determine highest possible final transfer address given a base */ | ||
193 | #define DMA_MAXEND(addr) (0x01000000UL-(((unsigned long)(addr))&0x00ffffffUL)) | ||
194 | |||
195 | /* Yes, I hack a lot of elisp in my spare time... */ | ||
196 | #define DMA_ERROR_P(regs) ((((regs)->cond_reg) & DMA_HNDL_ERROR)) | ||
197 | #define DMA_IRQ_P(regs) ((((regs)->cond_reg) & (DMA_HNDL_INTR | DMA_HNDL_ERROR))) | ||
198 | #define DMA_WRITE_P(regs) ((((regs)->cond_reg) & DMA_ST_WRITE)) | ||
199 | #define DMA_OFF(regs) ((((regs)->cond_reg) &= (~DMA_ENABLE))) | ||
200 | #define DMA_INTSOFF(regs) ((((regs)->cond_reg) &= (~DMA_INT_ENAB))) | ||
201 | #define DMA_INTSON(regs) ((((regs)->cond_reg) |= (DMA_INT_ENAB))) | ||
202 | #define DMA_PUNTFIFO(regs) ((((regs)->cond_reg) |= DMA_FIFO_INV)) | ||
203 | #define DMA_SETSTART(regs, addr) ((((regs)->st_addr) = (char *) addr)) | ||
204 | #define DMA_BEGINDMA_W(regs) \ | ||
205 | ((((regs)->cond_reg |= (DMA_ST_WRITE|DMA_ENABLE|DMA_INT_ENAB)))) | ||
206 | #define DMA_BEGINDMA_R(regs) \ | ||
207 | ((((regs)->cond_reg |= ((DMA_ENABLE|DMA_INT_ENAB)&(~DMA_ST_WRITE))))) | ||
208 | |||
209 | /* For certain DMA chips, we need to disable ints upon irq entry | ||
210 | * and turn them back on when we are done. So in any ESP interrupt | ||
211 | * handler you *must* call DMA_IRQ_ENTRY upon entry and DMA_IRQ_EXIT | ||
212 | * when leaving the handler. You have been warned... | ||
213 | */ | ||
214 | #define DMA_IRQ_ENTRY(dma, dregs) do { \ | ||
215 | if(DMA_ISBROKEN(dma)) DMA_INTSOFF(dregs); \ | ||
216 | } while (0) | ||
217 | |||
218 | #define DMA_IRQ_EXIT(dma, dregs) do { \ | ||
219 | if(DMA_ISBROKEN(dma)) DMA_INTSON(dregs); \ | ||
220 | } while(0) | ||
221 | |||
222 | /* Reset the friggin' thing... */ | ||
223 | #define DMA_RESET(dma) do { \ | ||
224 | struct sparc_dma_registers *regs = dma->regs; \ | ||
225 | /* Let the current FIFO drain itself */ \ | ||
226 | sparc_dma_pause(regs, (DMA_FIFO_ISDRAIN)); \ | ||
227 | /* Reset the logic */ \ | ||
228 | regs->cond_reg |= (DMA_RST_SCSI); /* assert */ \ | ||
229 | __delay(400); /* let the bits set ;) */ \ | ||
230 | regs->cond_reg &= ~(DMA_RST_SCSI); /* de-assert */ \ | ||
231 | sparc_dma_enable_interrupts(regs); /* Re-enable interrupts */ \ | ||
232 | /* Enable FAST transfers if available */ \ | ||
233 | if(dma->revision>dvmarev1) regs->cond_reg |= DMA_3CLKS; \ | ||
234 | dma->running = 0; \ | ||
235 | } while(0) | ||
236 | |||
237 | |||
238 | #endif /* !CONFIG_SUN3 */ | ||
239 | |||
240 | #endif /* !(__M68K_DVMA_H) */ | ||
diff --git a/include/asm-m68k/elf.h b/include/asm-m68k/elf.h deleted file mode 100644 index 0b0f49eb876b..000000000000 --- a/include/asm-m68k/elf.h +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | #ifndef __ASMm68k_ELF_H | ||
2 | #define __ASMm68k_ELF_H | ||
3 | |||
4 | /* | ||
5 | * ELF register definitions.. | ||
6 | */ | ||
7 | |||
8 | #include <asm/ptrace.h> | ||
9 | #include <asm/user.h> | ||
10 | |||
11 | /* | ||
12 | * 68k ELF relocation types | ||
13 | */ | ||
14 | #define R_68K_NONE 0 | ||
15 | #define R_68K_32 1 | ||
16 | #define R_68K_16 2 | ||
17 | #define R_68K_8 3 | ||
18 | #define R_68K_PC32 4 | ||
19 | #define R_68K_PC16 5 | ||
20 | #define R_68K_PC8 6 | ||
21 | #define R_68K_GOT32 7 | ||
22 | #define R_68K_GOT16 8 | ||
23 | #define R_68K_GOT8 9 | ||
24 | #define R_68K_GOT32O 10 | ||
25 | #define R_68K_GOT16O 11 | ||
26 | #define R_68K_GOT8O 12 | ||
27 | #define R_68K_PLT32 13 | ||
28 | #define R_68K_PLT16 14 | ||
29 | #define R_68K_PLT8 15 | ||
30 | #define R_68K_PLT32O 16 | ||
31 | #define R_68K_PLT16O 17 | ||
32 | #define R_68K_PLT8O 18 | ||
33 | #define R_68K_COPY 19 | ||
34 | #define R_68K_GLOB_DAT 20 | ||
35 | #define R_68K_JMP_SLOT 21 | ||
36 | #define R_68K_RELATIVE 22 | ||
37 | |||
38 | typedef unsigned long elf_greg_t; | ||
39 | |||
40 | #define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t)) | ||
41 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | ||
42 | |||
43 | typedef struct user_m68kfp_struct elf_fpregset_t; | ||
44 | |||
45 | /* | ||
46 | * This is used to ensure we don't load something for the wrong architecture. | ||
47 | */ | ||
48 | #define elf_check_arch(x) ((x)->e_machine == EM_68K) | ||
49 | |||
50 | /* | ||
51 | * These are used to set parameters in the core dumps. | ||
52 | */ | ||
53 | #define ELF_CLASS ELFCLASS32 | ||
54 | #define ELF_DATA ELFDATA2MSB | ||
55 | #define ELF_ARCH EM_68K | ||
56 | |||
57 | /* For SVR4/m68k the function pointer to be registered with `atexit' is | ||
58 | passed in %a1. Although my copy of the ABI has no such statement, it | ||
59 | is actually used on ASV. */ | ||
60 | #define ELF_PLAT_INIT(_r, load_addr) _r->a1 = 0 | ||
61 | |||
62 | #define USE_ELF_CORE_DUMP | ||
63 | #ifndef CONFIG_SUN3 | ||
64 | #define ELF_EXEC_PAGESIZE 4096 | ||
65 | #else | ||
66 | #define ELF_EXEC_PAGESIZE 8192 | ||
67 | #endif | ||
68 | |||
69 | /* This is the location that an ET_DYN program is loaded if exec'ed. Typical | ||
70 | use of this is to invoke "./ld.so someprog" to test out a new version of | ||
71 | the loader. We need to make sure that it is out of the way of the program | ||
72 | that it will "exec", and that there is sufficient room for the brk. */ | ||
73 | |||
74 | #ifndef CONFIG_SUN3 | ||
75 | #define ELF_ET_DYN_BASE 0xD0000000UL | ||
76 | #else | ||
77 | #define ELF_ET_DYN_BASE 0x0D800000UL | ||
78 | #endif | ||
79 | |||
80 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | ||
81 | /* Bleech. */ \ | ||
82 | pr_reg[0] = regs->d1; \ | ||
83 | pr_reg[1] = regs->d2; \ | ||
84 | pr_reg[2] = regs->d3; \ | ||
85 | pr_reg[3] = regs->d4; \ | ||
86 | pr_reg[4] = regs->d5; \ | ||
87 | pr_reg[7] = regs->a0; \ | ||
88 | pr_reg[8] = regs->a1; \ | ||
89 | pr_reg[9] = regs->a2; \ | ||
90 | pr_reg[14] = regs->d0; \ | ||
91 | pr_reg[15] = rdusp(); \ | ||
92 | pr_reg[16] = regs->orig_d0; \ | ||
93 | pr_reg[17] = regs->sr; \ | ||
94 | pr_reg[18] = regs->pc; \ | ||
95 | pr_reg[19] = (regs->format << 12) | regs->vector; \ | ||
96 | { \ | ||
97 | struct switch_stack *sw = ((struct switch_stack *)regs) - 1; \ | ||
98 | pr_reg[5] = sw->d6; \ | ||
99 | pr_reg[6] = sw->d7; \ | ||
100 | pr_reg[10] = sw->a3; \ | ||
101 | pr_reg[11] = sw->a4; \ | ||
102 | pr_reg[12] = sw->a5; \ | ||
103 | pr_reg[13] = sw->a6; \ | ||
104 | } | ||
105 | |||
106 | /* This yields a mask that user programs can use to figure out what | ||
107 | instruction set this cpu supports. */ | ||
108 | |||
109 | #define ELF_HWCAP (0) | ||
110 | |||
111 | /* This yields a string that ld.so will use to load implementation | ||
112 | specific libraries for optimization. This is more specific in | ||
113 | intent than poking at uname or /proc/cpuinfo. */ | ||
114 | |||
115 | #define ELF_PLATFORM (NULL) | ||
116 | |||
117 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX) | ||
118 | |||
119 | #endif | ||
diff --git a/include/asm-m68k/emergency-restart.h b/include/asm-m68k/emergency-restart.h deleted file mode 100644 index 108d8c48e42e..000000000000 --- a/include/asm-m68k/emergency-restart.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_EMERGENCY_RESTART_H | ||
2 | #define _ASM_EMERGENCY_RESTART_H | ||
3 | |||
4 | #include <asm-generic/emergency-restart.h> | ||
5 | |||
6 | #endif /* _ASM_EMERGENCY_RESTART_H */ | ||
diff --git a/include/asm-m68k/entry.h b/include/asm-m68k/entry.h deleted file mode 100644 index 5202f5a5b420..000000000000 --- a/include/asm-m68k/entry.h +++ /dev/null | |||
@@ -1,137 +0,0 @@ | |||
1 | #ifndef __M68K_ENTRY_H | ||
2 | #define __M68K_ENTRY_H | ||
3 | |||
4 | #include <asm/setup.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | /* | ||
8 | * Stack layout in 'ret_from_exception': | ||
9 | * | ||
10 | * This allows access to the syscall arguments in registers d1-d5 | ||
11 | * | ||
12 | * 0(sp) - d1 | ||
13 | * 4(sp) - d2 | ||
14 | * 8(sp) - d3 | ||
15 | * C(sp) - d4 | ||
16 | * 10(sp) - d5 | ||
17 | * 14(sp) - a0 | ||
18 | * 18(sp) - a1 | ||
19 | * 1C(sp) - a2 | ||
20 | * 20(sp) - d0 | ||
21 | * 24(sp) - orig_d0 | ||
22 | * 28(sp) - stack adjustment | ||
23 | * 2C(sp) - sr | ||
24 | * 2E(sp) - pc | ||
25 | * 32(sp) - format & vector | ||
26 | */ | ||
27 | |||
28 | /* | ||
29 | * 97/05/14 Andreas: Register %a2 is now set to the current task throughout | ||
30 | * the whole kernel. | ||
31 | */ | ||
32 | |||
33 | /* the following macro is used when enabling interrupts */ | ||
34 | #if defined(MACH_ATARI_ONLY) | ||
35 | /* block out HSYNC on the atari */ | ||
36 | #define ALLOWINT (~0x400) | ||
37 | #define MAX_NOINT_IPL 3 | ||
38 | #else | ||
39 | /* portable version */ | ||
40 | #define ALLOWINT (~0x700) | ||
41 | #define MAX_NOINT_IPL 0 | ||
42 | #endif /* machine compilation types */ | ||
43 | |||
44 | #ifdef __ASSEMBLY__ | ||
45 | |||
46 | #define curptr a2 | ||
47 | |||
48 | LFLUSH_I_AND_D = 0x00000808 | ||
49 | LSIGTRAP = 5 | ||
50 | |||
51 | /* process bits for task_struct.ptrace */ | ||
52 | PT_TRACESYS_OFF = 3 | ||
53 | PT_TRACESYS_BIT = 1 | ||
54 | PT_PTRACED_OFF = 3 | ||
55 | PT_PTRACED_BIT = 0 | ||
56 | PT_DTRACE_OFF = 3 | ||
57 | PT_DTRACE_BIT = 2 | ||
58 | |||
59 | #define SAVE_ALL_INT save_all_int | ||
60 | #define SAVE_ALL_SYS save_all_sys | ||
61 | #define RESTORE_ALL restore_all | ||
62 | /* | ||
63 | * This defines the normal kernel pt-regs layout. | ||
64 | * | ||
65 | * regs a3-a6 and d6-d7 are preserved by C code | ||
66 | * the kernel doesn't mess with usp unless it needs to | ||
67 | */ | ||
68 | |||
69 | /* | ||
70 | * a -1 in the orig_d0 field signifies | ||
71 | * that the stack frame is NOT for syscall | ||
72 | */ | ||
73 | .macro save_all_int | ||
74 | clrl %sp@- | stk_adj | ||
75 | pea -1:w | orig d0 | ||
76 | movel %d0,%sp@- | d0 | ||
77 | moveml %d1-%d5/%a0-%a1/%curptr,%sp@- | ||
78 | .endm | ||
79 | |||
80 | .macro save_all_sys | ||
81 | clrl %sp@- | stk_adj | ||
82 | movel %d0,%sp@- | orig d0 | ||
83 | movel %d0,%sp@- | d0 | ||
84 | moveml %d1-%d5/%a0-%a1/%curptr,%sp@- | ||
85 | .endm | ||
86 | |||
87 | .macro restore_all | ||
88 | moveml %sp@+,%a0-%a1/%curptr/%d1-%d5 | ||
89 | movel %sp@+,%d0 | ||
90 | addql #4,%sp | orig d0 | ||
91 | addl %sp@+,%sp | stk adj | ||
92 | rte | ||
93 | .endm | ||
94 | |||
95 | #define SWITCH_STACK_SIZE (6*4+4) /* includes return address */ | ||
96 | |||
97 | #define SAVE_SWITCH_STACK save_switch_stack | ||
98 | #define RESTORE_SWITCH_STACK restore_switch_stack | ||
99 | #define GET_CURRENT(tmp) get_current tmp | ||
100 | |||
101 | .macro save_switch_stack | ||
102 | moveml %a3-%a6/%d6-%d7,%sp@- | ||
103 | .endm | ||
104 | |||
105 | .macro restore_switch_stack | ||
106 | moveml %sp@+,%a3-%a6/%d6-%d7 | ||
107 | .endm | ||
108 | |||
109 | .macro get_current reg=%d0 | ||
110 | movel %sp,\reg | ||
111 | andw #-THREAD_SIZE,\reg | ||
112 | movel \reg,%curptr | ||
113 | movel %curptr@,%curptr | ||
114 | .endm | ||
115 | |||
116 | #else /* C source */ | ||
117 | |||
118 | #define STR(X) STR1(X) | ||
119 | #define STR1(X) #X | ||
120 | |||
121 | #define PT_OFF_ORIG_D0 0x24 | ||
122 | #define PT_OFF_FORMATVEC 0x32 | ||
123 | #define PT_OFF_SR 0x2C | ||
124 | #define SAVE_ALL_INT \ | ||
125 | "clrl %%sp@-;" /* stk_adj */ \ | ||
126 | "pea -1:w;" /* orig d0 = -1 */ \ | ||
127 | "movel %%d0,%%sp@-;" /* d0 */ \ | ||
128 | "moveml %%d1-%%d5/%%a0-%%a2,%%sp@-" | ||
129 | #define GET_CURRENT(tmp) \ | ||
130 | "movel %%sp,"#tmp"\n\t" \ | ||
131 | "andw #-"STR(THREAD_SIZE)","#tmp"\n\t" \ | ||
132 | "movel "#tmp",%%a2\n\t" \ | ||
133 | "movel %%a2@,%%a2" | ||
134 | |||
135 | #endif | ||
136 | |||
137 | #endif /* __M68K_ENTRY_H */ | ||
diff --git a/include/asm-m68k/errno.h b/include/asm-m68k/errno.h deleted file mode 100644 index 0d4e188d6ef6..000000000000 --- a/include/asm-m68k/errno.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_ERRNO_H | ||
2 | #define _M68K_ERRNO_H | ||
3 | |||
4 | #include <asm-generic/errno.h> | ||
5 | |||
6 | #endif /* _M68K_ERRNO_H */ | ||
diff --git a/include/asm-m68k/fb.h b/include/asm-m68k/fb.h deleted file mode 100644 index 380b97ae8157..000000000000 --- a/include/asm-m68k/fb.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | #ifndef _ASM_FB_H_ | ||
2 | #define _ASM_FB_H_ | ||
3 | |||
4 | #include <linux/fb.h> | ||
5 | #include <linux/fs.h> | ||
6 | #include <asm/page.h> | ||
7 | #include <asm/setup.h> | ||
8 | |||
9 | #ifdef CONFIG_SUN3 | ||
10 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
11 | unsigned long off) | ||
12 | { | ||
13 | pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE; | ||
14 | } | ||
15 | #else | ||
16 | static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, | ||
17 | unsigned long off) | ||
18 | { | ||
19 | if (CPU_IS_020_OR_030) | ||
20 | pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030; | ||
21 | if (CPU_IS_040_OR_060) { | ||
22 | pgprot_val(vma->vm_page_prot) &= _CACHEMASK040; | ||
23 | /* Use no-cache mode, serialized */ | ||
24 | pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S; | ||
25 | } | ||
26 | } | ||
27 | #endif /* CONFIG_SUN3 */ | ||
28 | |||
29 | static inline int fb_is_primary_device(struct fb_info *info) | ||
30 | { | ||
31 | return 0; | ||
32 | } | ||
33 | |||
34 | #endif /* _ASM_FB_H_ */ | ||
diff --git a/include/asm-m68k/fbio.h b/include/asm-m68k/fbio.h deleted file mode 100644 index b9215a0907d3..000000000000 --- a/include/asm-m68k/fbio.h +++ /dev/null | |||
@@ -1,330 +0,0 @@ | |||
1 | #ifndef __LINUX_FBIO_H | ||
2 | #define __LINUX_FBIO_H | ||
3 | |||
4 | #include <linux/compiler.h> | ||
5 | #include <linux/types.h> | ||
6 | |||
7 | /* Constants used for fbio SunOS compatibility */ | ||
8 | /* (C) 1996 Miguel de Icaza */ | ||
9 | |||
10 | /* Frame buffer types */ | ||
11 | #define FBTYPE_NOTYPE -1 | ||
12 | #define FBTYPE_SUN1BW 0 /* mono */ | ||
13 | #define FBTYPE_SUN1COLOR 1 | ||
14 | #define FBTYPE_SUN2BW 2 | ||
15 | #define FBTYPE_SUN2COLOR 3 | ||
16 | #define FBTYPE_SUN2GP 4 | ||
17 | #define FBTYPE_SUN5COLOR 5 | ||
18 | #define FBTYPE_SUN3COLOR 6 | ||
19 | #define FBTYPE_MEMCOLOR 7 | ||
20 | #define FBTYPE_SUN4COLOR 8 | ||
21 | |||
22 | #define FBTYPE_NOTSUN1 9 | ||
23 | #define FBTYPE_NOTSUN2 10 | ||
24 | #define FBTYPE_NOTSUN3 11 | ||
25 | |||
26 | #define FBTYPE_SUNFAST_COLOR 12 /* cg6 */ | ||
27 | #define FBTYPE_SUNROP_COLOR 13 | ||
28 | #define FBTYPE_SUNFB_VIDEO 14 | ||
29 | #define FBTYPE_SUNGIFB 15 | ||
30 | #define FBTYPE_SUNGPLAS 16 | ||
31 | #define FBTYPE_SUNGP3 17 | ||
32 | #define FBTYPE_SUNGT 18 | ||
33 | #define FBTYPE_SUNLEO 19 /* zx Leo card */ | ||
34 | #define FBTYPE_MDICOLOR 20 /* cg14 */ | ||
35 | #define FBTYPE_TCXCOLOR 21 /* SUNW,tcx card */ | ||
36 | |||
37 | #define FBTYPE_LASTPLUSONE 21 /* This is not last + 1 in fact... */ | ||
38 | |||
39 | /* Does not seem to be listed in the Sun file either */ | ||
40 | #define FBTYPE_CREATOR 22 | ||
41 | #define FBTYPE_PCI_IGA1682 23 | ||
42 | #define FBTYPE_P9100COLOR 24 | ||
43 | |||
44 | #define FBTYPE_PCI_GENERIC 1000 | ||
45 | #define FBTYPE_PCI_MACH64 1001 | ||
46 | |||
47 | /* fbio ioctls */ | ||
48 | /* Returned by FBIOGTYPE */ | ||
49 | struct fbtype { | ||
50 | int fb_type; /* fb type, see above */ | ||
51 | int fb_height; /* pixels */ | ||
52 | int fb_width; /* pixels */ | ||
53 | int fb_depth; | ||
54 | int fb_cmsize; /* color map entries */ | ||
55 | int fb_size; /* fb size in bytes */ | ||
56 | }; | ||
57 | #define FBIOGTYPE _IOR('F', 0, struct fbtype) | ||
58 | |||
59 | struct fbcmap { | ||
60 | int index; /* first element (0 origin) */ | ||
61 | int count; | ||
62 | unsigned char __user *red; | ||
63 | unsigned char __user *green; | ||
64 | unsigned char __user *blue; | ||
65 | }; | ||
66 | |||
67 | #ifdef __KERNEL__ | ||
68 | #define FBIOPUTCMAP_SPARC _IOW('F', 3, struct fbcmap) | ||
69 | #define FBIOGETCMAP_SPARC _IOW('F', 4, struct fbcmap) | ||
70 | #else | ||
71 | #define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) | ||
72 | #define FBIOGETCMAP _IOW('F', 4, struct fbcmap) | ||
73 | #endif | ||
74 | |||
75 | /* # of device specific values */ | ||
76 | #define FB_ATTR_NDEVSPECIFIC 8 | ||
77 | /* # of possible emulations */ | ||
78 | #define FB_ATTR_NEMUTYPES 4 | ||
79 | |||
80 | struct fbsattr { | ||
81 | int flags; | ||
82 | int emu_type; /* -1 if none */ | ||
83 | int dev_specific[FB_ATTR_NDEVSPECIFIC]; | ||
84 | }; | ||
85 | |||
86 | struct fbgattr { | ||
87 | int real_type; /* real frame buffer type */ | ||
88 | int owner; /* unknown */ | ||
89 | struct fbtype fbtype; /* real frame buffer fbtype */ | ||
90 | struct fbsattr sattr; | ||
91 | int emu_types[FB_ATTR_NEMUTYPES]; /* supported emulations */ | ||
92 | }; | ||
93 | #define FBIOSATTR _IOW('F', 5, struct fbgattr) /* Unsupported: */ | ||
94 | #define FBIOGATTR _IOR('F', 6, struct fbgattr) /* supported */ | ||
95 | |||
96 | #define FBIOSVIDEO _IOW('F', 7, int) | ||
97 | #define FBIOGVIDEO _IOR('F', 8, int) | ||
98 | |||
99 | struct fbcursor { | ||
100 | short set; /* what to set, choose from the list above */ | ||
101 | short enable; /* cursor on/off */ | ||
102 | struct fbcurpos pos; /* cursor position */ | ||
103 | struct fbcurpos hot; /* cursor hot spot */ | ||
104 | struct fbcmap cmap; /* color map info */ | ||
105 | struct fbcurpos size; /* cursor bit map size */ | ||
106 | char __user *image; /* cursor image bits */ | ||
107 | char __user *mask; /* cursor mask bits */ | ||
108 | }; | ||
109 | |||
110 | /* set/get cursor attributes/shape */ | ||
111 | #define FBIOSCURSOR _IOW('F', 24, struct fbcursor) | ||
112 | #define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) | ||
113 | |||
114 | /* set/get cursor position */ | ||
115 | #define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) | ||
116 | #define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) | ||
117 | |||
118 | /* get max cursor size */ | ||
119 | #define FBIOGCURMAX _IOR('F', 28, struct fbcurpos) | ||
120 | |||
121 | /* wid manipulation */ | ||
122 | struct fb_wid_alloc { | ||
123 | #define FB_WID_SHARED_8 0 | ||
124 | #define FB_WID_SHARED_24 1 | ||
125 | #define FB_WID_DBL_8 2 | ||
126 | #define FB_WID_DBL_24 3 | ||
127 | __u32 wa_type; | ||
128 | __s32 wa_index; /* Set on return */ | ||
129 | __u32 wa_count; | ||
130 | }; | ||
131 | struct fb_wid_item { | ||
132 | __u32 wi_type; | ||
133 | __s32 wi_index; | ||
134 | __u32 wi_attrs; | ||
135 | __u32 wi_values[32]; | ||
136 | }; | ||
137 | struct fb_wid_list { | ||
138 | __u32 wl_flags; | ||
139 | __u32 wl_count; | ||
140 | struct fb_wid_item *wl_list; | ||
141 | }; | ||
142 | |||
143 | #define FBIO_WID_ALLOC _IOWR('F', 30, struct fb_wid_alloc) | ||
144 | #define FBIO_WID_FREE _IOW('F', 31, struct fb_wid_alloc) | ||
145 | #define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list) | ||
146 | #define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list) | ||
147 | |||
148 | /* Creator ioctls */ | ||
149 | #define FFB_IOCTL ('F'<<8) | ||
150 | #define FFB_SYS_INFO (FFB_IOCTL|80) | ||
151 | #define FFB_CLUTREAD (FFB_IOCTL|81) | ||
152 | #define FFB_CLUTPOST (FFB_IOCTL|82) | ||
153 | #define FFB_SETDIAGMODE (FFB_IOCTL|83) | ||
154 | #define FFB_GETMONITORID (FFB_IOCTL|84) | ||
155 | #define FFB_GETVIDEOMODE (FFB_IOCTL|85) | ||
156 | #define FFB_SETVIDEOMODE (FFB_IOCTL|86) | ||
157 | #define FFB_SETSERVER (FFB_IOCTL|87) | ||
158 | #define FFB_SETOVCTL (FFB_IOCTL|88) | ||
159 | #define FFB_GETOVCTL (FFB_IOCTL|89) | ||
160 | #define FFB_GETSAXNUM (FFB_IOCTL|90) | ||
161 | #define FFB_FBDEBUG (FFB_IOCTL|91) | ||
162 | |||
163 | /* Cg14 ioctls */ | ||
164 | #define MDI_IOCTL ('M'<<8) | ||
165 | #define MDI_RESET (MDI_IOCTL|1) | ||
166 | #define MDI_GET_CFGINFO (MDI_IOCTL|2) | ||
167 | #define MDI_SET_PIXELMODE (MDI_IOCTL|3) | ||
168 | # define MDI_32_PIX 32 | ||
169 | # define MDI_16_PIX 16 | ||
170 | # define MDI_8_PIX 8 | ||
171 | |||
172 | struct mdi_cfginfo { | ||
173 | int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ | ||
174 | int mdi_type; /* FBTYPE name */ | ||
175 | int mdi_height; /* height */ | ||
176 | int mdi_width; /* widht */ | ||
177 | int mdi_size; /* available ram */ | ||
178 | int mdi_mode; /* 8bpp, 16bpp or 32bpp */ | ||
179 | int mdi_pixfreq; /* pixel clock (from PROM) */ | ||
180 | }; | ||
181 | |||
182 | /* SparcLinux specific ioctl for the MDI, should be replaced for | ||
183 | * the SET_XLUT/SET_CLUTn ioctls instead | ||
184 | */ | ||
185 | #define MDI_CLEAR_XLUT (MDI_IOCTL|9) | ||
186 | |||
187 | /* leo & ffb ioctls */ | ||
188 | struct fb_clut_alloc { | ||
189 | __u32 clutid; /* Set on return */ | ||
190 | __u32 flag; | ||
191 | __u32 index; | ||
192 | }; | ||
193 | |||
194 | struct fb_clut { | ||
195 | #define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */ | ||
196 | __u32 flag; | ||
197 | __u32 clutid; | ||
198 | __u32 offset; | ||
199 | __u32 count; | ||
200 | char * red; | ||
201 | char * green; | ||
202 | char * blue; | ||
203 | }; | ||
204 | |||
205 | struct fb_clut32 { | ||
206 | __u32 flag; | ||
207 | __u32 clutid; | ||
208 | __u32 offset; | ||
209 | __u32 count; | ||
210 | __u32 red; | ||
211 | __u32 green; | ||
212 | __u32 blue; | ||
213 | }; | ||
214 | |||
215 | #define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc) | ||
216 | #define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc) | ||
217 | #define LEO_CLUTREAD _IOW('L', 55, struct fb_clut) | ||
218 | #define LEO_CLUTPOST _IOW('L', 56, struct fb_clut) | ||
219 | #define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */ | ||
220 | #define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */ | ||
221 | |||
222 | #ifdef __KERNEL__ | ||
223 | /* Addresses on the fd of a cgsix that are mappable */ | ||
224 | #define CG6_FBC 0x70000000 | ||
225 | #define CG6_TEC 0x70001000 | ||
226 | #define CG6_BTREGS 0x70002000 | ||
227 | #define CG6_FHC 0x70004000 | ||
228 | #define CG6_THC 0x70005000 | ||
229 | #define CG6_ROM 0x70006000 | ||
230 | #define CG6_RAM 0x70016000 | ||
231 | #define CG6_DHC 0x80000000 | ||
232 | |||
233 | #define CG3_MMAP_OFFSET 0x4000000 | ||
234 | |||
235 | /* Addresses on the fd of a tcx that are mappable */ | ||
236 | #define TCX_RAM8BIT 0x00000000 | ||
237 | #define TCX_RAM24BIT 0x01000000 | ||
238 | #define TCX_UNK3 0x10000000 | ||
239 | #define TCX_UNK4 0x20000000 | ||
240 | #define TCX_CONTROLPLANE 0x28000000 | ||
241 | #define TCX_UNK6 0x30000000 | ||
242 | #define TCX_UNK7 0x38000000 | ||
243 | #define TCX_TEC 0x70000000 | ||
244 | #define TCX_BTREGS 0x70002000 | ||
245 | #define TCX_THC 0x70004000 | ||
246 | #define TCX_DHC 0x70008000 | ||
247 | #define TCX_ALT 0x7000a000 | ||
248 | #define TCX_SYNC 0x7000e000 | ||
249 | #define TCX_UNK2 0x70010000 | ||
250 | |||
251 | /* CG14 definitions */ | ||
252 | |||
253 | /* Offsets into the OBIO space: */ | ||
254 | #define CG14_REGS 0 /* registers */ | ||
255 | #define CG14_CURSORREGS 0x1000 /* cursor registers */ | ||
256 | #define CG14_DACREGS 0x2000 /* DAC registers */ | ||
257 | #define CG14_XLUT 0x3000 /* X Look Up Table -- ??? */ | ||
258 | #define CG14_CLUT1 0x4000 /* Color Look Up Table */ | ||
259 | #define CG14_CLUT2 0x5000 /* Color Look Up Table */ | ||
260 | #define CG14_CLUT3 0x6000 /* Color Look Up Table */ | ||
261 | #define CG14_AUTO 0xf000 | ||
262 | |||
263 | #endif /* KERNEL */ | ||
264 | |||
265 | /* These are exported to userland for applications to use */ | ||
266 | /* Mappable offsets for the cg14: control registers */ | ||
267 | #define MDI_DIRECT_MAP 0x10000000 | ||
268 | #define MDI_CTLREG_MAP 0x20000000 | ||
269 | #define MDI_CURSOR_MAP 0x30000000 | ||
270 | #define MDI_SHDW_VRT_MAP 0x40000000 | ||
271 | |||
272 | /* Mappable offsets for the cg14: frame buffer resolutions */ | ||
273 | /* 32 bits */ | ||
274 | #define MDI_CHUNKY_XBGR_MAP 0x50000000 | ||
275 | #define MDI_CHUNKY_BGR_MAP 0x60000000 | ||
276 | |||
277 | /* 16 bits */ | ||
278 | #define MDI_PLANAR_X16_MAP 0x70000000 | ||
279 | #define MDI_PLANAR_C16_MAP 0x80000000 | ||
280 | |||
281 | /* 8 bit is done as CG3 MMAP offset */ | ||
282 | /* 32 bits, planar */ | ||
283 | #define MDI_PLANAR_X32_MAP 0x90000000 | ||
284 | #define MDI_PLANAR_B32_MAP 0xa0000000 | ||
285 | #define MDI_PLANAR_G32_MAP 0xb0000000 | ||
286 | #define MDI_PLANAR_R32_MAP 0xc0000000 | ||
287 | |||
288 | /* Mappable offsets on leo */ | ||
289 | #define LEO_SS0_MAP 0x00000000 | ||
290 | #define LEO_LC_SS0_USR_MAP 0x00800000 | ||
291 | #define LEO_LD_SS0_MAP 0x00801000 | ||
292 | #define LEO_LX_CURSOR_MAP 0x00802000 | ||
293 | #define LEO_SS1_MAP 0x00803000 | ||
294 | #define LEO_LC_SS1_USR_MAP 0x01003000 | ||
295 | #define LEO_LD_SS1_MAP 0x01004000 | ||
296 | #define LEO_UNK_MAP 0x01005000 | ||
297 | #define LEO_LX_KRN_MAP 0x01006000 | ||
298 | #define LEO_LC_SS0_KRN_MAP 0x01007000 | ||
299 | #define LEO_LC_SS1_KRN_MAP 0x01008000 | ||
300 | #define LEO_LD_GBL_MAP 0x01009000 | ||
301 | #define LEO_UNK2_MAP 0x0100a000 | ||
302 | |||
303 | #ifdef __KERNEL__ | ||
304 | struct fbcmap32 { | ||
305 | int index; /* first element (0 origin) */ | ||
306 | int count; | ||
307 | u32 red; | ||
308 | u32 green; | ||
309 | u32 blue; | ||
310 | }; | ||
311 | |||
312 | #define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32) | ||
313 | #define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32) | ||
314 | |||
315 | struct fbcursor32 { | ||
316 | short set; /* what to set, choose from the list above */ | ||
317 | short enable; /* cursor on/off */ | ||
318 | struct fbcurpos pos; /* cursor position */ | ||
319 | struct fbcurpos hot; /* cursor hot spot */ | ||
320 | struct fbcmap32 cmap; /* color map info */ | ||
321 | struct fbcurpos size; /* cursor bit map size */ | ||
322 | u32 image; /* cursor image bits */ | ||
323 | u32 mask; /* cursor mask bits */ | ||
324 | }; | ||
325 | |||
326 | #define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32) | ||
327 | #define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32) | ||
328 | #endif | ||
329 | |||
330 | #endif /* __LINUX_FBIO_H */ | ||
diff --git a/include/asm-m68k/fcntl.h b/include/asm-m68k/fcntl.h deleted file mode 100644 index 1c369b20dc45..000000000000 --- a/include/asm-m68k/fcntl.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | #ifndef _M68K_FCNTL_H | ||
2 | #define _M68K_FCNTL_H | ||
3 | |||
4 | #define O_DIRECTORY 040000 /* must be a directory */ | ||
5 | #define O_NOFOLLOW 0100000 /* don't follow links */ | ||
6 | #define O_DIRECT 0200000 /* direct disk access hint - currently ignored */ | ||
7 | #define O_LARGEFILE 0400000 | ||
8 | |||
9 | #include <asm-generic/fcntl.h> | ||
10 | |||
11 | #endif /* _M68K_FCNTL_H */ | ||
diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h deleted file mode 100644 index 697d50393dd0..000000000000 --- a/include/asm-m68k/floppy.h +++ /dev/null | |||
@@ -1,254 +0,0 @@ | |||
1 | /* | ||
2 | * Implementation independent bits of the Floppy driver. | ||
3 | * | ||
4 | * much of this file is derived from what was originally the Q40 floppy driver. | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file "COPYING" in the main directory of this archive | ||
8 | * for more details. | ||
9 | * | ||
10 | * Copyright (C) 1999, 2000, 2001 | ||
11 | * | ||
12 | * Sun3x support added 2/4/2000 Sam Creasey (sammy@sammy.net) | ||
13 | * | ||
14 | */ | ||
15 | |||
16 | #include <asm/io.h> | ||
17 | |||
18 | #include <linux/vmalloc.h> | ||
19 | |||
20 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id); | ||
21 | |||
22 | /* constants... */ | ||
23 | |||
24 | #undef MAX_DMA_ADDRESS | ||
25 | #define MAX_DMA_ADDRESS 0x00 /* nothing like that */ | ||
26 | |||
27 | |||
28 | /* | ||
29 | * Again, the CMOS information doesn't work on m68k.. | ||
30 | */ | ||
31 | #define FLOPPY0_TYPE (MACH_IS_Q40 ? 6 : 4) | ||
32 | #define FLOPPY1_TYPE 0 | ||
33 | |||
34 | /* basically PC init + set use_virtual_dma */ | ||
35 | #define FDC1 m68k_floppy_init() | ||
36 | |||
37 | #define N_FDC 1 | ||
38 | #define N_DRIVE 8 | ||
39 | |||
40 | |||
41 | /* vdma globals adapted from asm-i386/floppy.h */ | ||
42 | |||
43 | static int virtual_dma_count=0; | ||
44 | static int virtual_dma_residue=0; | ||
45 | static char *virtual_dma_addr=NULL; | ||
46 | static int virtual_dma_mode=0; | ||
47 | static int doing_pdma=0; | ||
48 | |||
49 | #include <asm/sun3xflop.h> | ||
50 | |||
51 | extern spinlock_t dma_spin_lock; | ||
52 | |||
53 | static __inline__ unsigned long claim_dma_lock(void) | ||
54 | { | ||
55 | unsigned long flags; | ||
56 | spin_lock_irqsave(&dma_spin_lock, flags); | ||
57 | return flags; | ||
58 | } | ||
59 | |||
60 | static __inline__ void release_dma_lock(unsigned long flags) | ||
61 | { | ||
62 | spin_unlock_irqrestore(&dma_spin_lock, flags); | ||
63 | } | ||
64 | |||
65 | |||
66 | static __inline__ unsigned char fd_inb(int port) | ||
67 | { | ||
68 | if(MACH_IS_Q40) | ||
69 | return inb_p(port); | ||
70 | else if(MACH_IS_SUN3X) | ||
71 | return sun3x_82072_fd_inb(port); | ||
72 | return 0; | ||
73 | } | ||
74 | |||
75 | static __inline__ void fd_outb(unsigned char value, int port) | ||
76 | { | ||
77 | if(MACH_IS_Q40) | ||
78 | outb_p(value, port); | ||
79 | else if(MACH_IS_SUN3X) | ||
80 | sun3x_82072_fd_outb(value, port); | ||
81 | } | ||
82 | |||
83 | |||
84 | static int fd_request_irq(void) | ||
85 | { | ||
86 | if(MACH_IS_Q40) | ||
87 | return request_irq(FLOPPY_IRQ, floppy_hardint, | ||
88 | IRQF_DISABLED, "floppy", floppy_hardint); | ||
89 | else if(MACH_IS_SUN3X) | ||
90 | return sun3xflop_request_irq(); | ||
91 | return -ENXIO; | ||
92 | } | ||
93 | |||
94 | static void fd_free_irq(void) | ||
95 | { | ||
96 | if(MACH_IS_Q40) | ||
97 | free_irq(FLOPPY_IRQ, floppy_hardint); | ||
98 | } | ||
99 | |||
100 | #define fd_request_dma() vdma_request_dma(FLOPPY_DMA,"floppy") | ||
101 | #define fd_get_dma_residue() vdma_get_dma_residue(FLOPPY_DMA) | ||
102 | #define fd_dma_mem_alloc(size) vdma_mem_alloc(size) | ||
103 | #define fd_dma_setup(addr, size, mode, io) vdma_dma_setup(addr, size, mode, io) | ||
104 | |||
105 | #define fd_enable_irq() /* nothing... */ | ||
106 | #define fd_disable_irq() /* nothing... */ | ||
107 | |||
108 | #define fd_free_dma() /* nothing */ | ||
109 | |||
110 | /* No 64k boundary crossing problems on Q40 - no DMA at all */ | ||
111 | #define CROSS_64KB(a,s) (0) | ||
112 | |||
113 | #define DMA_MODE_READ 0x44 /* i386 look-alike */ | ||
114 | #define DMA_MODE_WRITE 0x48 | ||
115 | |||
116 | |||
117 | static int m68k_floppy_init(void) | ||
118 | { | ||
119 | use_virtual_dma =1; | ||
120 | can_use_virtual_dma = 1; | ||
121 | |||
122 | |||
123 | if (MACH_IS_Q40) | ||
124 | return 0x3f0; | ||
125 | else if(MACH_IS_SUN3X) | ||
126 | return sun3xflop_init(); | ||
127 | else | ||
128 | return -1; | ||
129 | } | ||
130 | |||
131 | |||
132 | static int vdma_request_dma(unsigned int dmanr, const char * device_id) | ||
133 | { | ||
134 | return 0; | ||
135 | } | ||
136 | |||
137 | |||
138 | static int vdma_get_dma_residue(unsigned int dummy) | ||
139 | { | ||
140 | return virtual_dma_count + virtual_dma_residue; | ||
141 | } | ||
142 | |||
143 | |||
144 | static unsigned long vdma_mem_alloc(unsigned long size) | ||
145 | { | ||
146 | return (unsigned long) vmalloc(size); | ||
147 | |||
148 | } | ||
149 | |||
150 | static void _fd_dma_mem_free(unsigned long addr, unsigned long size) | ||
151 | { | ||
152 | vfree((void *)addr); | ||
153 | } | ||
154 | #define fd_dma_mem_free(addr,size) _fd_dma_mem_free(addr, size) | ||
155 | |||
156 | |||
157 | /* choose_dma_mode ???*/ | ||
158 | |||
159 | static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
160 | { | ||
161 | doing_pdma = 1; | ||
162 | virtual_dma_port = (MACH_IS_Q40 ? io : 0); | ||
163 | virtual_dma_mode = (mode == DMA_MODE_WRITE); | ||
164 | virtual_dma_addr = addr; | ||
165 | virtual_dma_count = size; | ||
166 | virtual_dma_residue = 0; | ||
167 | return 0; | ||
168 | } | ||
169 | |||
170 | |||
171 | |||
172 | static void fd_disable_dma(void) | ||
173 | { | ||
174 | doing_pdma = 0; | ||
175 | virtual_dma_residue += virtual_dma_count; | ||
176 | virtual_dma_count=0; | ||
177 | } | ||
178 | |||
179 | |||
180 | |||
181 | /* this is the only truly Q40 specific function */ | ||
182 | |||
183 | asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id) | ||
184 | { | ||
185 | register unsigned char st; | ||
186 | |||
187 | #undef TRACE_FLPY_INT | ||
188 | #define NO_FLOPPY_ASSEMBLER | ||
189 | |||
190 | #ifdef TRACE_FLPY_INT | ||
191 | static int calls=0; | ||
192 | static int bytes=0; | ||
193 | static int dma_wait=0; | ||
194 | #endif | ||
195 | if(!doing_pdma) { | ||
196 | floppy_interrupt(irq, dev_id); | ||
197 | return IRQ_HANDLED; | ||
198 | } | ||
199 | |||
200 | #ifdef TRACE_FLPY_INT | ||
201 | if(!calls) | ||
202 | bytes = virtual_dma_count; | ||
203 | #endif | ||
204 | |||
205 | { | ||
206 | register int lcount; | ||
207 | register char *lptr; | ||
208 | |||
209 | /* serve 1st byte fast: */ | ||
210 | |||
211 | st=1; | ||
212 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
213 | lcount; lcount--, lptr++) { | ||
214 | st=inb(virtual_dma_port+4) & 0xa0 ; | ||
215 | if(st != 0xa0) | ||
216 | break; | ||
217 | if(virtual_dma_mode) | ||
218 | outb_p(*lptr, virtual_dma_port+5); | ||
219 | else | ||
220 | *lptr = inb_p(virtual_dma_port+5); | ||
221 | } | ||
222 | |||
223 | virtual_dma_count = lcount; | ||
224 | virtual_dma_addr = lptr; | ||
225 | st = inb(virtual_dma_port+4); | ||
226 | } | ||
227 | |||
228 | #ifdef TRACE_FLPY_INT | ||
229 | calls++; | ||
230 | #endif | ||
231 | if(st == 0x20) | ||
232 | return IRQ_HANDLED; | ||
233 | if(!(st & 0x20)) { | ||
234 | virtual_dma_residue += virtual_dma_count; | ||
235 | virtual_dma_count=0; | ||
236 | #ifdef TRACE_FLPY_INT | ||
237 | printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", | ||
238 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
239 | dma_wait); | ||
240 | calls = 0; | ||
241 | dma_wait=0; | ||
242 | #endif | ||
243 | doing_pdma = 0; | ||
244 | floppy_interrupt(irq, dev_id); | ||
245 | return IRQ_HANDLED; | ||
246 | } | ||
247 | #ifdef TRACE_FLPY_INT | ||
248 | if(!virtual_dma_count) | ||
249 | dma_wait++; | ||
250 | #endif | ||
251 | return IRQ_HANDLED; | ||
252 | } | ||
253 | |||
254 | #define EXTRA_FLOPPY_PARAMS | ||
diff --git a/include/asm-m68k/fpu.h b/include/asm-m68k/fpu.h deleted file mode 100644 index ffb6b8cfc6d5..000000000000 --- a/include/asm-m68k/fpu.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | #ifndef __M68K_FPU_H | ||
2 | #define __M68K_FPU_H | ||
3 | |||
4 | |||
5 | /* | ||
6 | * MAX floating point unit state size (FSAVE/FRESTORE) | ||
7 | */ | ||
8 | |||
9 | #if defined(CONFIG_M68020) || defined(CONFIG_M68030) | ||
10 | #define FPSTATESIZE (216) | ||
11 | #elif defined(CONFIG_M68040) | ||
12 | #define FPSTATESIZE (96) | ||
13 | #elif defined(CONFIG_M68KFPU_EMU) | ||
14 | #define FPSTATESIZE (28) | ||
15 | #elif defined(CONFIG_M68060) | ||
16 | #define FPSTATESIZE (12) | ||
17 | #else | ||
18 | #define FPSTATESIZE (0) | ||
19 | #endif | ||
20 | |||
21 | #endif /* __M68K_FPU_H */ | ||
diff --git a/include/asm-m68k/futex.h b/include/asm-m68k/futex.h deleted file mode 100644 index 6a332a9f099c..000000000000 --- a/include/asm-m68k/futex.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_FUTEX_H | ||
2 | #define _ASM_FUTEX_H | ||
3 | |||
4 | #include <asm-generic/futex.h> | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-m68k/hardirq.h b/include/asm-m68k/hardirq.h deleted file mode 100644 index 394ee946015c..000000000000 --- a/include/asm-m68k/hardirq.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #ifndef __M68K_HARDIRQ_H | ||
2 | #define __M68K_HARDIRQ_H | ||
3 | |||
4 | #include <linux/threads.h> | ||
5 | #include <linux/cache.h> | ||
6 | |||
7 | /* entry.S is sensitive to the offsets of these fields */ | ||
8 | typedef struct { | ||
9 | unsigned int __softirq_pending; | ||
10 | } ____cacheline_aligned irq_cpustat_t; | ||
11 | |||
12 | #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ | ||
13 | |||
14 | #define HARDIRQ_BITS 8 | ||
15 | |||
16 | #endif | ||
diff --git a/include/asm-m68k/hp300hw.h b/include/asm-m68k/hp300hw.h deleted file mode 100644 index d998ea67c19c..000000000000 --- a/include/asm-m68k/hp300hw.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifndef _M68K_HP300HW_H | ||
2 | #define _M68K_HP300HW_H | ||
3 | |||
4 | extern unsigned long hp300_model; | ||
5 | |||
6 | /* This information was taken from NetBSD */ | ||
7 | #define HP_320 (0) /* 16MHz 68020+HP MMU+16K external cache */ | ||
8 | #define HP_330 (1) /* 16MHz 68020+68851 MMU */ | ||
9 | #define HP_340 (2) /* 16MHz 68030 */ | ||
10 | #define HP_345 (3) /* 50MHz 68030+32K external cache */ | ||
11 | #define HP_350 (4) /* 25MHz 68020+HP MMU+32K external cache */ | ||
12 | #define HP_360 (5) /* 25MHz 68030 */ | ||
13 | #define HP_370 (6) /* 33MHz 68030+64K external cache */ | ||
14 | #define HP_375 (7) /* 50MHz 68030+32K external cache */ | ||
15 | #define HP_380 (8) /* 25MHz 68040 */ | ||
16 | #define HP_385 (9) /* 33MHz 68040 */ | ||
17 | |||
18 | #define HP_400 (10) /* 50MHz 68030+32K external cache */ | ||
19 | #define HP_425T (11) /* 25MHz 68040 - model 425t */ | ||
20 | #define HP_425S (12) /* 25MHz 68040 - model 425s */ | ||
21 | #define HP_425E (13) /* 25MHz 68040 - model 425e */ | ||
22 | #define HP_433T (14) /* 33MHz 68040 - model 433t */ | ||
23 | #define HP_433S (15) /* 33MHz 68040 - model 433s */ | ||
24 | |||
25 | #endif /* _M68K_HP300HW_H */ | ||
diff --git a/include/asm-m68k/hw_irq.h b/include/asm-m68k/hw_irq.h deleted file mode 100644 index eacef0951fbf..000000000000 --- a/include/asm-m68k/hw_irq.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __ASM_M68K_HW_IRQ_H | ||
2 | #define __ASM_M68K_HW_IRQ_H | ||
3 | |||
4 | /* Dummy include. */ | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-m68k/hwtest.h b/include/asm-m68k/hwtest.h deleted file mode 100644 index 402c8a4401fe..000000000000 --- a/include/asm-m68k/hwtest.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | /* Routines to test for presence/absence of hardware registers: | ||
2 | * see arch/m68k/mm/hwtest.c. | ||
3 | * -- PMM <pmaydell@chiark.greenend.org.uk> 05/1998 | ||
4 | * | ||
5 | * Removed __init from decls. We might want them in modules, and | ||
6 | * the code is tiny anyway. 16/5/98 pb | ||
7 | */ | ||
8 | |||
9 | #ifndef __ASM_HWTEST_H | ||
10 | #define __ASM_HWTEST_H | ||
11 | |||
12 | extern int hwreg_present(volatile void *regp); | ||
13 | extern int hwreg_write(volatile void *regp, unsigned short val); | ||
14 | |||
15 | #endif | ||
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h deleted file mode 100644 index b996a3c8cff5..000000000000 --- a/include/asm-m68k/ide.h +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-m68k/ide.h | ||
3 | * | ||
4 | * Copyright (C) 1994-1996 Linus Torvalds & authors | ||
5 | */ | ||
6 | |||
7 | /* Copyright(c) 1996 Kars de Jong */ | ||
8 | /* Based on the ide driver from 1.2.13pl8 */ | ||
9 | |||
10 | /* | ||
11 | * Credits (alphabetical): | ||
12 | * | ||
13 | * - Bjoern Brauel | ||
14 | * - Kars de Jong | ||
15 | * - Torsten Ebeling | ||
16 | * - Dwight Engen | ||
17 | * - Thorsten Floeck | ||
18 | * - Roman Hodek | ||
19 | * - Guenther Kelleter | ||
20 | * - Chris Lawrence | ||
21 | * - Michael Rausch | ||
22 | * - Christian Sauer | ||
23 | * - Michael Schmitz | ||
24 | * - Jes Soerensen | ||
25 | * - Michael Thurm | ||
26 | * - Geert Uytterhoeven | ||
27 | */ | ||
28 | |||
29 | #ifndef _M68K_IDE_H | ||
30 | #define _M68K_IDE_H | ||
31 | |||
32 | #ifdef __KERNEL__ | ||
33 | |||
34 | |||
35 | #include <asm/setup.h> | ||
36 | #include <asm/io.h> | ||
37 | #include <asm/irq.h> | ||
38 | |||
39 | #ifdef CONFIG_ATARI | ||
40 | #include <linux/interrupt.h> | ||
41 | #include <asm/atari_stdma.h> | ||
42 | #endif | ||
43 | |||
44 | #ifdef CONFIG_MAC | ||
45 | #include <asm/macints.h> | ||
46 | #endif | ||
47 | |||
48 | /* | ||
49 | * Get rid of defs from io.h - ide has its private and conflicting versions | ||
50 | * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we | ||
51 | * always use the `raw' MMIO versions | ||
52 | */ | ||
53 | #undef inb | ||
54 | #undef inw | ||
55 | #undef insw | ||
56 | #undef inl | ||
57 | #undef insl | ||
58 | #undef outb | ||
59 | #undef outw | ||
60 | #undef outsw | ||
61 | #undef outl | ||
62 | #undef outsl | ||
63 | #undef readb | ||
64 | #undef readw | ||
65 | #undef readl | ||
66 | #undef writeb | ||
67 | #undef writew | ||
68 | #undef writel | ||
69 | |||
70 | #define inb in_8 | ||
71 | #define inw in_be16 | ||
72 | #define insw(port, addr, n) raw_insw((u16 *)port, addr, n) | ||
73 | #define inl in_be32 | ||
74 | #define insl(port, addr, n) raw_insl((u32 *)port, addr, n) | ||
75 | #define outb(val, port) out_8(port, val) | ||
76 | #define outw(val, port) out_be16(port, val) | ||
77 | #define outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) | ||
78 | #define outl(val, port) out_be32(port, val) | ||
79 | #define outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) | ||
80 | #define readb in_8 | ||
81 | #define readw in_be16 | ||
82 | #define __ide_mm_insw(port, addr, n) raw_insw((u16 *)port, addr, n) | ||
83 | #define readl in_be32 | ||
84 | #define __ide_mm_insl(port, addr, n) raw_insl((u32 *)port, addr, n) | ||
85 | #define writeb(val, port) out_8(port, val) | ||
86 | #define writew(val, port) out_be16(port, val) | ||
87 | #define __ide_mm_outsw(port, addr, n) raw_outsw((u16 *)port, addr, n) | ||
88 | #define writel(val, port) out_be32(port, val) | ||
89 | #define __ide_mm_outsl(port, addr, n) raw_outsl((u32 *)port, addr, n) | ||
90 | #if defined(CONFIG_ATARI) || defined(CONFIG_Q40) | ||
91 | #define insw_swapw(port, addr, n) raw_insw_swapw((u16 *)port, addr, n) | ||
92 | #define outsw_swapw(port, addr, n) raw_outsw_swapw((u16 *)port, addr, n) | ||
93 | #endif | ||
94 | |||
95 | #ifdef CONFIG_BLK_DEV_FALCON_IDE | ||
96 | #define IDE_ARCH_LOCK | ||
97 | |||
98 | extern int falconide_intr_lock; | ||
99 | |||
100 | static __inline__ void ide_release_lock (void) | ||
101 | { | ||
102 | if (MACH_IS_ATARI) { | ||
103 | if (falconide_intr_lock == 0) { | ||
104 | printk("ide_release_lock: bug\n"); | ||
105 | return; | ||
106 | } | ||
107 | falconide_intr_lock = 0; | ||
108 | stdma_release(); | ||
109 | } | ||
110 | } | ||
111 | |||
112 | static __inline__ void | ||
113 | ide_get_lock(irq_handler_t handler, void *data) | ||
114 | { | ||
115 | if (MACH_IS_ATARI) { | ||
116 | if (falconide_intr_lock == 0) { | ||
117 | if (in_interrupt() > 0) | ||
118 | panic( "Falcon IDE hasn't ST-DMA lock in interrupt" ); | ||
119 | stdma_lock(handler, data); | ||
120 | falconide_intr_lock = 1; | ||
121 | } | ||
122 | } | ||
123 | } | ||
124 | #endif /* CONFIG_BLK_DEV_FALCON_IDE */ | ||
125 | |||
126 | #define IDE_ARCH_ACK_INTR | ||
127 | #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) | ||
128 | |||
129 | #endif /* __KERNEL__ */ | ||
130 | #endif /* _M68K_IDE_H */ | ||
diff --git a/include/asm-m68k/idprom.h b/include/asm-m68k/idprom.h deleted file mode 100644 index 160616a89e05..000000000000 --- a/include/asm-m68k/idprom.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | #ifndef _M68K_IDPROM_H | ||
2 | #define _M68K_IDPROM_H | ||
3 | /* | ||
4 | * idprom.h: Macros and defines for idprom routines | ||
5 | * | ||
6 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) | ||
7 | */ | ||
8 | |||
9 | #include <linux/types.h> | ||
10 | |||
11 | struct idprom { | ||
12 | u8 id_format; /* Format identifier (always 0x01) */ | ||
13 | u8 id_machtype; /* Machine type */ | ||
14 | u8 id_ethaddr[6]; /* Hardware ethernet address */ | ||
15 | s32 id_date; /* Date of manufacture */ | ||
16 | u32 id_sernum:24; /* Unique serial number */ | ||
17 | u8 id_cksum; /* Checksum - xor of the data bytes */ | ||
18 | u8 reserved[16]; | ||
19 | }; | ||
20 | |||
21 | extern struct idprom *idprom; | ||
22 | extern void idprom_init(void); | ||
23 | |||
24 | /* Sun3: in control space */ | ||
25 | #define SUN3_IDPROM_BASE 0x00000000 | ||
26 | |||
27 | #endif /* !(_M68K_IDPROM_H) */ | ||
diff --git a/include/asm-m68k/intersil.h b/include/asm-m68k/intersil.h deleted file mode 100644 index f482902cac8a..000000000000 --- a/include/asm-m68k/intersil.h +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | #ifndef _SUN3_INTERSIL_H | ||
2 | #define _SUN3_INTERSIL_H | ||
3 | /* bits 0 and 1 */ | ||
4 | #define INTERSIL_FREQ_32K 0x00 | ||
5 | #define INTERSIL_FREQ_1M 0x01 | ||
6 | #define INTERSIL_FREQ_2M 0x02 | ||
7 | #define INTERSIL_FREQ_4M 0x03 | ||
8 | |||
9 | /* bit 2 */ | ||
10 | #define INTERSIL_12H_MODE 0x00 | ||
11 | #define INTERSIL_24H_MODE 0x04 | ||
12 | |||
13 | /* bit 3 */ | ||
14 | #define INTERSIL_STOP 0x00 | ||
15 | #define INTERSIL_RUN 0x08 | ||
16 | |||
17 | /* bit 4 */ | ||
18 | #define INTERSIL_INT_ENABLE 0x10 | ||
19 | #define INTERSIL_INT_DISABLE 0x00 | ||
20 | |||
21 | /* bit 5 */ | ||
22 | #define INTERSIL_MODE_NORMAL 0x00 | ||
23 | #define INTERSIL_MODE_TEST 0x20 | ||
24 | |||
25 | #define INTERSIL_HZ_100_MASK 0x02 | ||
26 | |||
27 | struct intersil_dt { | ||
28 | unsigned char csec; | ||
29 | unsigned char hour; | ||
30 | unsigned char minute; | ||
31 | unsigned char second; | ||
32 | unsigned char month; | ||
33 | unsigned char day; | ||
34 | unsigned char year; | ||
35 | unsigned char weekday; | ||
36 | }; | ||
37 | |||
38 | struct intersil_7170 { | ||
39 | struct intersil_dt counter; | ||
40 | struct intersil_dt alarm; | ||
41 | unsigned char int_reg; | ||
42 | unsigned char cmd_reg; | ||
43 | }; | ||
44 | |||
45 | extern volatile char* clock_va; | ||
46 | #define intersil_clock ((volatile struct intersil_7170 *) clock_va) | ||
47 | #define intersil_clear() (void)intersil_clock->int_reg | ||
48 | #endif | ||
diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h deleted file mode 100644 index 9e673e3bd434..000000000000 --- a/include/asm-m68k/io.h +++ /dev/null | |||
@@ -1,369 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-m68k/io.h | ||
3 | * | ||
4 | * 4/1/00 RZ: - rewritten to avoid clashes between ISA/PCI and other | ||
5 | * IO access | ||
6 | * - added Q40 support | ||
7 | * - added skeleton for GG-II and Amiga PCMCIA | ||
8 | * 2/3/01 RZ: - moved a few more defs into raw_io.h | ||
9 | * | ||
10 | * inX/outX should not be used by any driver unless it does | ||
11 | * ISA access. Other drivers should use function defined in raw_io.h | ||
12 | * or define its own macros on top of these. | ||
13 | * | ||
14 | * inX(),outX() are for ISA I/O | ||
15 | * isa_readX(),isa_writeX() are for ISA memory | ||
16 | */ | ||
17 | |||
18 | #ifndef _IO_H | ||
19 | #define _IO_H | ||
20 | |||
21 | #ifdef __KERNEL__ | ||
22 | |||
23 | #include <linux/compiler.h> | ||
24 | #include <asm/raw_io.h> | ||
25 | #include <asm/virtconvert.h> | ||
26 | |||
27 | #include <asm-generic/iomap.h> | ||
28 | |||
29 | #ifdef CONFIG_ATARI | ||
30 | #include <asm/atarihw.h> | ||
31 | #endif | ||
32 | |||
33 | |||
34 | /* | ||
35 | * IO/MEM definitions for various ISA bridges | ||
36 | */ | ||
37 | |||
38 | |||
39 | #ifdef CONFIG_Q40 | ||
40 | |||
41 | #define q40_isa_io_base 0xff400000 | ||
42 | #define q40_isa_mem_base 0xff800000 | ||
43 | |||
44 | #define Q40_ISA_IO_B(ioaddr) (q40_isa_io_base+1+4*((unsigned long)(ioaddr))) | ||
45 | #define Q40_ISA_IO_W(ioaddr) (q40_isa_io_base+ 4*((unsigned long)(ioaddr))) | ||
46 | #define Q40_ISA_MEM_B(madr) (q40_isa_mem_base+1+4*((unsigned long)(madr))) | ||
47 | #define Q40_ISA_MEM_W(madr) (q40_isa_mem_base+ 4*((unsigned long)(madr))) | ||
48 | |||
49 | #define MULTI_ISA 0 | ||
50 | #endif /* Q40 */ | ||
51 | |||
52 | /* GG-II Zorro to ISA bridge */ | ||
53 | #ifdef CONFIG_GG2 | ||
54 | |||
55 | extern unsigned long gg2_isa_base; | ||
56 | #define GG2_ISA_IO_B(ioaddr) (gg2_isa_base+1+((unsigned long)(ioaddr)*4)) | ||
57 | #define GG2_ISA_IO_W(ioaddr) (gg2_isa_base+ ((unsigned long)(ioaddr)*4)) | ||
58 | #define GG2_ISA_MEM_B(madr) (gg2_isa_base+1+(((unsigned long)(madr)*4) & 0xfffff)) | ||
59 | #define GG2_ISA_MEM_W(madr) (gg2_isa_base+ (((unsigned long)(madr)*4) & 0xfffff)) | ||
60 | |||
61 | #ifndef MULTI_ISA | ||
62 | #define MULTI_ISA 0 | ||
63 | #else | ||
64 | #undef MULTI_ISA | ||
65 | #define MULTI_ISA 1 | ||
66 | #endif | ||
67 | #endif /* GG2 */ | ||
68 | |||
69 | #ifdef CONFIG_AMIGA_PCMCIA | ||
70 | #include <asm/amigayle.h> | ||
71 | |||
72 | #define AG_ISA_IO_B(ioaddr) ( GAYLE_IO+(ioaddr)+(((ioaddr)&1)*GAYLE_ODD) ) | ||
73 | #define AG_ISA_IO_W(ioaddr) ( GAYLE_IO+(ioaddr) ) | ||
74 | |||
75 | #ifndef MULTI_ISA | ||
76 | #define MULTI_ISA 0 | ||
77 | #else | ||
78 | #undef MULTI_ISA | ||
79 | #define MULTI_ISA 1 | ||
80 | #endif | ||
81 | #endif /* AMIGA_PCMCIA */ | ||
82 | |||
83 | |||
84 | |||
85 | #ifdef CONFIG_ISA | ||
86 | |||
87 | #if MULTI_ISA == 0 | ||
88 | #undef MULTI_ISA | ||
89 | #endif | ||
90 | |||
91 | #define ISA_TYPE_Q40 (1) | ||
92 | #define ISA_TYPE_GG2 (2) | ||
93 | #define ISA_TYPE_AG (3) | ||
94 | |||
95 | #if defined(CONFIG_Q40) && !defined(MULTI_ISA) | ||
96 | #define ISA_TYPE ISA_TYPE_Q40 | ||
97 | #define ISA_SEX 0 | ||
98 | #endif | ||
99 | #if defined(CONFIG_AMIGA_PCMCIA) && !defined(MULTI_ISA) | ||
100 | #define ISA_TYPE ISA_TYPE_AG | ||
101 | #define ISA_SEX 1 | ||
102 | #endif | ||
103 | #if defined(CONFIG_GG2) && !defined(MULTI_ISA) | ||
104 | #define ISA_TYPE ISA_TYPE_GG2 | ||
105 | #define ISA_SEX 0 | ||
106 | #endif | ||
107 | |||
108 | #ifdef MULTI_ISA | ||
109 | extern int isa_type; | ||
110 | extern int isa_sex; | ||
111 | |||
112 | #define ISA_TYPE isa_type | ||
113 | #define ISA_SEX isa_sex | ||
114 | #endif | ||
115 | |||
116 | /* | ||
117 | * define inline addr translation functions. Normally only one variant will | ||
118 | * be compiled in so the case statement will be optimised away | ||
119 | */ | ||
120 | |||
121 | static inline u8 __iomem *isa_itb(unsigned long addr) | ||
122 | { | ||
123 | switch(ISA_TYPE) | ||
124 | { | ||
125 | #ifdef CONFIG_Q40 | ||
126 | case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_IO_B(addr); | ||
127 | #endif | ||
128 | #ifdef CONFIG_GG2 | ||
129 | case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_IO_B(addr); | ||
130 | #endif | ||
131 | #ifdef CONFIG_AMIGA_PCMCIA | ||
132 | case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr); | ||
133 | #endif | ||
134 | default: return NULL; /* avoid warnings, just in case */ | ||
135 | } | ||
136 | } | ||
137 | static inline u16 __iomem *isa_itw(unsigned long addr) | ||
138 | { | ||
139 | switch(ISA_TYPE) | ||
140 | { | ||
141 | #ifdef CONFIG_Q40 | ||
142 | case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_IO_W(addr); | ||
143 | #endif | ||
144 | #ifdef CONFIG_GG2 | ||
145 | case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_IO_W(addr); | ||
146 | #endif | ||
147 | #ifdef CONFIG_AMIGA_PCMCIA | ||
148 | case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr); | ||
149 | #endif | ||
150 | default: return NULL; /* avoid warnings, just in case */ | ||
151 | } | ||
152 | } | ||
153 | static inline u32 __iomem *isa_itl(unsigned long addr) | ||
154 | { | ||
155 | switch(ISA_TYPE) | ||
156 | { | ||
157 | #ifdef CONFIG_AMIGA_PCMCIA | ||
158 | case ISA_TYPE_AG: return (u32 __iomem *)AG_ISA_IO_W(addr); | ||
159 | #endif | ||
160 | default: return 0; /* avoid warnings, just in case */ | ||
161 | } | ||
162 | } | ||
163 | static inline u8 __iomem *isa_mtb(unsigned long addr) | ||
164 | { | ||
165 | switch(ISA_TYPE) | ||
166 | { | ||
167 | #ifdef CONFIG_Q40 | ||
168 | case ISA_TYPE_Q40: return (u8 __iomem *)Q40_ISA_MEM_B(addr); | ||
169 | #endif | ||
170 | #ifdef CONFIG_GG2 | ||
171 | case ISA_TYPE_GG2: return (u8 __iomem *)GG2_ISA_MEM_B(addr); | ||
172 | #endif | ||
173 | #ifdef CONFIG_AMIGA_PCMCIA | ||
174 | case ISA_TYPE_AG: return (u8 __iomem *)addr; | ||
175 | #endif | ||
176 | default: return NULL; /* avoid warnings, just in case */ | ||
177 | } | ||
178 | } | ||
179 | static inline u16 __iomem *isa_mtw(unsigned long addr) | ||
180 | { | ||
181 | switch(ISA_TYPE) | ||
182 | { | ||
183 | #ifdef CONFIG_Q40 | ||
184 | case ISA_TYPE_Q40: return (u16 __iomem *)Q40_ISA_MEM_W(addr); | ||
185 | #endif | ||
186 | #ifdef CONFIG_GG2 | ||
187 | case ISA_TYPE_GG2: return (u16 __iomem *)GG2_ISA_MEM_W(addr); | ||
188 | #endif | ||
189 | #ifdef CONFIG_AMIGA_PCMCIA | ||
190 | case ISA_TYPE_AG: return (u16 __iomem *)addr; | ||
191 | #endif | ||
192 | default: return NULL; /* avoid warnings, just in case */ | ||
193 | } | ||
194 | } | ||
195 | |||
196 | |||
197 | #define isa_inb(port) in_8(isa_itb(port)) | ||
198 | #define isa_inw(port) (ISA_SEX ? in_be16(isa_itw(port)) : in_le16(isa_itw(port))) | ||
199 | #define isa_inl(port) (ISA_SEX ? in_be32(isa_itl(port)) : in_le32(isa_itl(port))) | ||
200 | #define isa_outb(val,port) out_8(isa_itb(port),(val)) | ||
201 | #define isa_outw(val,port) (ISA_SEX ? out_be16(isa_itw(port),(val)) : out_le16(isa_itw(port),(val))) | ||
202 | #define isa_outl(val,port) (ISA_SEX ? out_be32(isa_itl(port),(val)) : out_le32(isa_itl(port),(val))) | ||
203 | |||
204 | #define isa_readb(p) in_8(isa_mtb((unsigned long)(p))) | ||
205 | #define isa_readw(p) \ | ||
206 | (ISA_SEX ? in_be16(isa_mtw((unsigned long)(p))) \ | ||
207 | : in_le16(isa_mtw((unsigned long)(p)))) | ||
208 | #define isa_writeb(val,p) out_8(isa_mtb((unsigned long)(p)),(val)) | ||
209 | #define isa_writew(val,p) \ | ||
210 | (ISA_SEX ? out_be16(isa_mtw((unsigned long)(p)),(val)) \ | ||
211 | : out_le16(isa_mtw((unsigned long)(p)),(val))) | ||
212 | |||
213 | static inline void isa_delay(void) | ||
214 | { | ||
215 | switch(ISA_TYPE) | ||
216 | { | ||
217 | #ifdef CONFIG_Q40 | ||
218 | case ISA_TYPE_Q40: isa_outb(0,0x80); break; | ||
219 | #endif | ||
220 | #ifdef CONFIG_GG2 | ||
221 | case ISA_TYPE_GG2: break; | ||
222 | #endif | ||
223 | #ifdef CONFIG_AMIGA_PCMCIA | ||
224 | case ISA_TYPE_AG: break; | ||
225 | #endif | ||
226 | default: break; /* avoid warnings */ | ||
227 | } | ||
228 | } | ||
229 | |||
230 | #define isa_inb_p(p) ({u8 v=isa_inb(p);isa_delay();v;}) | ||
231 | #define isa_outb_p(v,p) ({isa_outb((v),(p));isa_delay();}) | ||
232 | #define isa_inw_p(p) ({u16 v=isa_inw(p);isa_delay();v;}) | ||
233 | #define isa_outw_p(v,p) ({isa_outw((v),(p));isa_delay();}) | ||
234 | #define isa_inl_p(p) ({u32 v=isa_inl(p);isa_delay();v;}) | ||
235 | #define isa_outl_p(v,p) ({isa_outl((v),(p));isa_delay();}) | ||
236 | |||
237 | #define isa_insb(port, buf, nr) raw_insb(isa_itb(port), (u8 *)(buf), (nr)) | ||
238 | #define isa_outsb(port, buf, nr) raw_outsb(isa_itb(port), (u8 *)(buf), (nr)) | ||
239 | |||
240 | #define isa_insw(port, buf, nr) \ | ||
241 | (ISA_SEX ? raw_insw(isa_itw(port), (u16 *)(buf), (nr)) : \ | ||
242 | raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr))) | ||
243 | |||
244 | #define isa_outsw(port, buf, nr) \ | ||
245 | (ISA_SEX ? raw_outsw(isa_itw(port), (u16 *)(buf), (nr)) : \ | ||
246 | raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr))) | ||
247 | |||
248 | #define isa_insl(port, buf, nr) \ | ||
249 | (ISA_SEX ? raw_insl(isa_itl(port), (u32 *)(buf), (nr)) : \ | ||
250 | raw_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) | ||
251 | |||
252 | #define isa_outsl(port, buf, nr) \ | ||
253 | (ISA_SEX ? raw_outsl(isa_itl(port), (u32 *)(buf), (nr)) : \ | ||
254 | raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1)) | ||
255 | |||
256 | |||
257 | #define inb isa_inb | ||
258 | #define inb_p isa_inb_p | ||
259 | #define outb isa_outb | ||
260 | #define outb_p isa_outb_p | ||
261 | #define inw isa_inw | ||
262 | #define inw_p isa_inw_p | ||
263 | #define outw isa_outw | ||
264 | #define outw_p isa_outw_p | ||
265 | #define inl isa_inl | ||
266 | #define inl_p isa_inl_p | ||
267 | #define outl isa_outl | ||
268 | #define outl_p isa_outl_p | ||
269 | #define insb isa_insb | ||
270 | #define insw isa_insw | ||
271 | #define insl isa_insl | ||
272 | #define outsb isa_outsb | ||
273 | #define outsw isa_outsw | ||
274 | #define outsl isa_outsl | ||
275 | #define readb isa_readb | ||
276 | #define readw isa_readw | ||
277 | #define writeb isa_writeb | ||
278 | #define writew isa_writew | ||
279 | |||
280 | #else /* CONFIG_ISA */ | ||
281 | |||
282 | /* | ||
283 | * We need to define dummy functions for GENERIC_IOMAP support. | ||
284 | */ | ||
285 | #define inb(port) 0xff | ||
286 | #define inb_p(port) 0xff | ||
287 | #define outb(val,port) ((void)0) | ||
288 | #define outb_p(val,port) ((void)0) | ||
289 | #define inw(port) 0xffff | ||
290 | #define outw(val,port) ((void)0) | ||
291 | #define inl(port) 0xffffffffUL | ||
292 | #define outl(val,port) ((void)0) | ||
293 | |||
294 | #define insb(port,buf,nr) ((void)0) | ||
295 | #define outsb(port,buf,nr) ((void)0) | ||
296 | #define insw(port,buf,nr) ((void)0) | ||
297 | #define outsw(port,buf,nr) ((void)0) | ||
298 | #define insl(port,buf,nr) ((void)0) | ||
299 | #define outsl(port,buf,nr) ((void)0) | ||
300 | |||
301 | /* | ||
302 | * These should be valid on any ioremap()ed region | ||
303 | */ | ||
304 | #define readb(addr) in_8(addr) | ||
305 | #define writeb(val,addr) out_8((addr),(val)) | ||
306 | #define readw(addr) in_le16(addr) | ||
307 | #define writew(val,addr) out_le16((addr),(val)) | ||
308 | |||
309 | #endif /* CONFIG_ISA */ | ||
310 | |||
311 | #define readl(addr) in_le32(addr) | ||
312 | #define writel(val,addr) out_le32((addr),(val)) | ||
313 | |||
314 | #define mmiowb() | ||
315 | |||
316 | static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size) | ||
317 | { | ||
318 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
319 | } | ||
320 | static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned long size) | ||
321 | { | ||
322 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
323 | } | ||
324 | static inline void __iomem *ioremap_writethrough(unsigned long physaddr, | ||
325 | unsigned long size) | ||
326 | { | ||
327 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
328 | } | ||
329 | static inline void __iomem *ioremap_fullcache(unsigned long physaddr, | ||
330 | unsigned long size) | ||
331 | { | ||
332 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); | ||
333 | } | ||
334 | |||
335 | static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) | ||
336 | { | ||
337 | __builtin_memset((void __force *) addr, val, count); | ||
338 | } | ||
339 | static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count) | ||
340 | { | ||
341 | __builtin_memcpy(dst, (void __force *) src, count); | ||
342 | } | ||
343 | static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count) | ||
344 | { | ||
345 | __builtin_memcpy((void __force *) dst, src, count); | ||
346 | } | ||
347 | |||
348 | #ifndef CONFIG_SUN3 | ||
349 | #define IO_SPACE_LIMIT 0xffff | ||
350 | #else | ||
351 | #define IO_SPACE_LIMIT 0x0fffffff | ||
352 | #endif | ||
353 | |||
354 | #endif /* __KERNEL__ */ | ||
355 | |||
356 | #define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1 | ||
357 | |||
358 | /* | ||
359 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | ||
360 | * access | ||
361 | */ | ||
362 | #define xlate_dev_mem_ptr(p) __va(p) | ||
363 | |||
364 | /* | ||
365 | * Convert a virtual cached pointer to an uncached pointer | ||
366 | */ | ||
367 | #define xlate_dev_kmem_ptr(p) p | ||
368 | |||
369 | #endif /* _IO_H */ | ||
diff --git a/include/asm-m68k/ioctl.h b/include/asm-m68k/ioctl.h deleted file mode 100644 index b279fe06dfe5..000000000000 --- a/include/asm-m68k/ioctl.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/ioctl.h> | ||
diff --git a/include/asm-m68k/ioctls.h b/include/asm-m68k/ioctls.h deleted file mode 100644 index b8d2f4be7fd7..000000000000 --- a/include/asm-m68k/ioctls.h +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | #ifndef __ARCH_M68K_IOCTLS_H__ | ||
2 | #define __ARCH_M68K_IOCTLS_H__ | ||
3 | |||
4 | #include <asm/ioctl.h> | ||
5 | |||
6 | /* 0x54 is just a magic number to make these relatively unique ('T') */ | ||
7 | |||
8 | #define TCGETS 0x5401 | ||
9 | #define TCSETS 0x5402 | ||
10 | #define TCSETSW 0x5403 | ||
11 | #define TCSETSF 0x5404 | ||
12 | #define TCGETA 0x5405 | ||
13 | #define TCSETA 0x5406 | ||
14 | #define TCSETAW 0x5407 | ||
15 | #define TCSETAF 0x5408 | ||
16 | #define TCSBRK 0x5409 | ||
17 | #define TCXONC 0x540A | ||
18 | #define TCFLSH 0x540B | ||
19 | #define TIOCEXCL 0x540C | ||
20 | #define TIOCNXCL 0x540D | ||
21 | #define TIOCSCTTY 0x540E | ||
22 | #define TIOCGPGRP 0x540F | ||
23 | #define TIOCSPGRP 0x5410 | ||
24 | #define TIOCOUTQ 0x5411 | ||
25 | #define TIOCSTI 0x5412 | ||
26 | #define TIOCGWINSZ 0x5413 | ||
27 | #define TIOCSWINSZ 0x5414 | ||
28 | #define TIOCMGET 0x5415 | ||
29 | #define TIOCMBIS 0x5416 | ||
30 | #define TIOCMBIC 0x5417 | ||
31 | #define TIOCMSET 0x5418 | ||
32 | #define TIOCGSOFTCAR 0x5419 | ||
33 | #define TIOCSSOFTCAR 0x541A | ||
34 | #define FIONREAD 0x541B | ||
35 | #define TIOCINQ FIONREAD | ||
36 | #define TIOCLINUX 0x541C | ||
37 | #define TIOCCONS 0x541D | ||
38 | #define TIOCGSERIAL 0x541E | ||
39 | #define TIOCSSERIAL 0x541F | ||
40 | #define TIOCPKT 0x5420 | ||
41 | #define FIONBIO 0x5421 | ||
42 | #define TIOCNOTTY 0x5422 | ||
43 | #define TIOCSETD 0x5423 | ||
44 | #define TIOCGETD 0x5424 | ||
45 | #define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */ | ||
46 | #define TIOCSBRK 0x5427 /* BSD compatibility */ | ||
47 | #define TIOCCBRK 0x5428 /* BSD compatibility */ | ||
48 | #define TIOCGSID 0x5429 /* Return the session ID of FD */ | ||
49 | #define TCGETS2 _IOR('T',0x2A, struct termios2) | ||
50 | #define TCSETS2 _IOW('T',0x2B, struct termios2) | ||
51 | #define TCSETSW2 _IOW('T',0x2C, struct termios2) | ||
52 | #define TCSETSF2 _IOW('T',0x2D, struct termios2) | ||
53 | #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ | ||
54 | #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ | ||
55 | |||
56 | #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ | ||
57 | #define FIOCLEX 0x5451 | ||
58 | #define FIOASYNC 0x5452 | ||
59 | #define TIOCSERCONFIG 0x5453 | ||
60 | #define TIOCSERGWILD 0x5454 | ||
61 | #define TIOCSERSWILD 0x5455 | ||
62 | #define TIOCGLCKTRMIOS 0x5456 | ||
63 | #define TIOCSLCKTRMIOS 0x5457 | ||
64 | #define TIOCSERGSTRUCT 0x5458 /* For debugging only */ | ||
65 | #define TIOCSERGETLSR 0x5459 /* Get line status register */ | ||
66 | #define TIOCSERGETMULTI 0x545A /* Get multiport config */ | ||
67 | #define TIOCSERSETMULTI 0x545B /* Set multiport config */ | ||
68 | |||
69 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | ||
70 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | ||
71 | #define FIOQSIZE 0x545E | ||
72 | |||
73 | /* Used for packet mode */ | ||
74 | #define TIOCPKT_DATA 0 | ||
75 | #define TIOCPKT_FLUSHREAD 1 | ||
76 | #define TIOCPKT_FLUSHWRITE 2 | ||
77 | #define TIOCPKT_STOP 4 | ||
78 | #define TIOCPKT_START 8 | ||
79 | #define TIOCPKT_NOSTOP 16 | ||
80 | #define TIOCPKT_DOSTOP 32 | ||
81 | |||
82 | #define TIOCSER_TEMT 0x01 /* Transmitter physically empty */ | ||
83 | |||
84 | #endif /* __ARCH_M68K_IOCTLS_H__ */ | ||
diff --git a/include/asm-m68k/ipcbuf.h b/include/asm-m68k/ipcbuf.h deleted file mode 100644 index a623ea3f0955..000000000000 --- a/include/asm-m68k/ipcbuf.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | #ifndef __m68k_IPCBUF_H__ | ||
2 | #define __m68k_IPCBUF_H__ | ||
3 | |||
4 | /* | ||
5 | * The user_ipc_perm structure for m68k 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 | * - 32-bit mode_t and seq | ||
11 | * - 2 miscellaneous 32-bit values | ||
12 | */ | ||
13 | |||
14 | struct ipc64_perm | ||
15 | { | ||
16 | __kernel_key_t key; | ||
17 | __kernel_uid32_t uid; | ||
18 | __kernel_gid32_t gid; | ||
19 | __kernel_uid32_t cuid; | ||
20 | __kernel_gid32_t cgid; | ||
21 | __kernel_mode_t mode; | ||
22 | unsigned short __pad1; | ||
23 | unsigned short seq; | ||
24 | unsigned short __pad2; | ||
25 | unsigned long __unused1; | ||
26 | unsigned long __unused2; | ||
27 | }; | ||
28 | |||
29 | #endif /* __m68k_IPCBUF_H__ */ | ||
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h deleted file mode 100644 index 226bfc0f21b1..000000000000 --- a/include/asm-m68k/irq.h +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | #ifndef _M68K_IRQ_H_ | ||
2 | #define _M68K_IRQ_H_ | ||
3 | |||
4 | #include <linux/linkage.h> | ||
5 | #include <linux/hardirq.h> | ||
6 | #include <linux/spinlock_types.h> | ||
7 | |||
8 | /* | ||
9 | * This should be the same as the max(NUM_X_SOURCES) for all the | ||
10 | * different m68k hosts compiled into the kernel. | ||
11 | * Currently the Atari has 72 and the Amiga 24, but if both are | ||
12 | * supported in the kernel it is better to make room for 72. | ||
13 | */ | ||
14 | #if defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X) | ||
15 | #define NR_IRQS 200 | ||
16 | #elif defined(CONFIG_ATARI) || defined(CONFIG_MAC) | ||
17 | #define NR_IRQS 72 | ||
18 | #elif defined(CONFIG_Q40) | ||
19 | #define NR_IRQS 43 | ||
20 | #elif defined(CONFIG_AMIGA) | ||
21 | #define NR_IRQS 32 | ||
22 | #elif defined(CONFIG_APOLLO) | ||
23 | #define NR_IRQS 24 | ||
24 | #elif defined(CONFIG_HP300) | ||
25 | #define NR_IRQS 8 | ||
26 | #else | ||
27 | #define NR_IRQS 0 | ||
28 | #endif | ||
29 | |||
30 | /* | ||
31 | * The hardirq mask has to be large enough to have | ||
32 | * space for potentially all IRQ sources in the system | ||
33 | * nesting on a single CPU: | ||
34 | */ | ||
35 | #if (1 << HARDIRQ_BITS) < NR_IRQS | ||
36 | # error HARDIRQ_BITS is too low! | ||
37 | #endif | ||
38 | |||
39 | /* | ||
40 | * Interrupt source definitions | ||
41 | * General interrupt sources are the level 1-7. | ||
42 | * Adding an interrupt service routine for one of these sources | ||
43 | * results in the addition of that routine to a chain of routines. | ||
44 | * Each one is called in succession. Each individual interrupt | ||
45 | * service routine should determine if the device associated with | ||
46 | * that routine requires service. | ||
47 | */ | ||
48 | |||
49 | #define IRQ_SPURIOUS 0 | ||
50 | |||
51 | #define IRQ_AUTO_1 1 /* level 1 interrupt */ | ||
52 | #define IRQ_AUTO_2 2 /* level 2 interrupt */ | ||
53 | #define IRQ_AUTO_3 3 /* level 3 interrupt */ | ||
54 | #define IRQ_AUTO_4 4 /* level 4 interrupt */ | ||
55 | #define IRQ_AUTO_5 5 /* level 5 interrupt */ | ||
56 | #define IRQ_AUTO_6 6 /* level 6 interrupt */ | ||
57 | #define IRQ_AUTO_7 7 /* level 7 interrupt (non-maskable) */ | ||
58 | |||
59 | #define IRQ_USER 8 | ||
60 | |||
61 | extern unsigned int irq_canonicalize(unsigned int irq); | ||
62 | |||
63 | struct pt_regs; | ||
64 | |||
65 | /* | ||
66 | * various flags for request_irq() - the Amiga now uses the standard | ||
67 | * mechanism like all other architectures - IRQF_DISABLED and | ||
68 | * IRQF_SHARED are your friends. | ||
69 | */ | ||
70 | #ifndef MACH_AMIGA_ONLY | ||
71 | #define IRQ_FLG_LOCK (0x0001) /* handler is not replaceable */ | ||
72 | #define IRQ_FLG_REPLACE (0x0002) /* replace existing handler */ | ||
73 | #define IRQ_FLG_FAST (0x0004) | ||
74 | #define IRQ_FLG_SLOW (0x0008) | ||
75 | #define IRQ_FLG_STD (0x8000) /* internally used */ | ||
76 | #endif | ||
77 | |||
78 | /* | ||
79 | * This structure is used to chain together the ISRs for a particular | ||
80 | * interrupt source (if it supports chaining). | ||
81 | */ | ||
82 | typedef struct irq_node { | ||
83 | int (*handler)(int, void *); | ||
84 | void *dev_id; | ||
85 | struct irq_node *next; | ||
86 | unsigned long flags; | ||
87 | const char *devname; | ||
88 | } irq_node_t; | ||
89 | |||
90 | /* | ||
91 | * This structure has only 4 elements for speed reasons | ||
92 | */ | ||
93 | struct irq_handler { | ||
94 | int (*handler)(int, void *); | ||
95 | unsigned long flags; | ||
96 | void *dev_id; | ||
97 | const char *devname; | ||
98 | }; | ||
99 | |||
100 | struct irq_controller { | ||
101 | const char *name; | ||
102 | spinlock_t lock; | ||
103 | int (*startup)(unsigned int irq); | ||
104 | void (*shutdown)(unsigned int irq); | ||
105 | void (*enable)(unsigned int irq); | ||
106 | void (*disable)(unsigned int irq); | ||
107 | }; | ||
108 | |||
109 | extern int m68k_irq_startup(unsigned int); | ||
110 | extern void m68k_irq_shutdown(unsigned int); | ||
111 | |||
112 | /* | ||
113 | * This function returns a new irq_node_t | ||
114 | */ | ||
115 | extern irq_node_t *new_irq_node(void); | ||
116 | |||
117 | extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, struct pt_regs *)); | ||
118 | extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt, | ||
119 | void (*handler)(unsigned int, struct pt_regs *)); | ||
120 | extern void m68k_setup_irq_controller(struct irq_controller *, unsigned int, unsigned int); | ||
121 | |||
122 | asmlinkage void m68k_handle_int(unsigned int); | ||
123 | asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *); | ||
124 | |||
125 | #endif /* _M68K_IRQ_H_ */ | ||
diff --git a/include/asm-m68k/irq_regs.h b/include/asm-m68k/irq_regs.h deleted file mode 100644 index 3dd9c0b70270..000000000000 --- a/include/asm-m68k/irq_regs.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/irq_regs.h> | ||
diff --git a/include/asm-m68k/kdebug.h b/include/asm-m68k/kdebug.h deleted file mode 100644 index 6ece1b037665..000000000000 --- a/include/asm-m68k/kdebug.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/kdebug.h> | ||
diff --git a/include/asm-m68k/kmap_types.h b/include/asm-m68k/kmap_types.h deleted file mode 100644 index c843c63d3801..000000000000 --- a/include/asm-m68k/kmap_types.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | #ifndef __ASM_M68K_KMAP_TYPES_H | ||
2 | #define __ASM_M68K_KMAP_TYPES_H | ||
3 | |||
4 | enum km_type { | ||
5 | KM_BOUNCE_READ, | ||
6 | KM_SKB_SUNRPC_DATA, | ||
7 | KM_SKB_DATA_SOFTIRQ, | ||
8 | KM_USER0, | ||
9 | KM_USER1, | ||
10 | KM_BIO_SRC_IRQ, | ||
11 | KM_BIO_DST_IRQ, | ||
12 | KM_PTE0, | ||
13 | KM_PTE1, | ||
14 | KM_IRQ0, | ||
15 | KM_IRQ1, | ||
16 | KM_SOFTIRQ0, | ||
17 | KM_SOFTIRQ1, | ||
18 | KM_TYPE_NR | ||
19 | }; | ||
20 | |||
21 | #endif /* __ASM_M68K_KMAP_TYPES_H */ | ||
diff --git a/include/asm-m68k/linkage.h b/include/asm-m68k/linkage.h deleted file mode 100644 index 5a822bb790f7..000000000000 --- a/include/asm-m68k/linkage.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __ASM_LINKAGE_H | ||
2 | #define __ASM_LINKAGE_H | ||
3 | |||
4 | #define __ALIGN .align 4 | ||
5 | #define __ALIGN_STR ".align 4" | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-m68k/local.h b/include/asm-m68k/local.h deleted file mode 100644 index 6c259263e1f0..000000000000 --- a/include/asm-m68k/local.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_LOCAL_H | ||
2 | #define _ASM_M68K_LOCAL_H | ||
3 | |||
4 | #include <asm-generic/local.h> | ||
5 | |||
6 | #endif /* _ASM_M68K_LOCAL_H */ | ||
diff --git a/include/asm-m68k/mac_asc.h b/include/asm-m68k/mac_asc.h deleted file mode 100644 index fc2e5467b41e..000000000000 --- a/include/asm-m68k/mac_asc.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* | ||
2 | * Apple Sound Chip | ||
3 | */ | ||
4 | |||
5 | #ifndef __ASM_MAC_ASC_H | ||
6 | #define __ASM_MAC_ASC_H | ||
7 | |||
8 | /* | ||
9 | * ASC offsets and controls | ||
10 | */ | ||
11 | |||
12 | #define ASC_BUF_BASE 0x00 /* RAM buffer offset */ | ||
13 | #define ASC_BUF_SIZE 0x800 | ||
14 | |||
15 | #define ASC_CONTROL 0x800 | ||
16 | #define ASC_CONTROL_OFF 0x00 | ||
17 | #define ASC_FREQ(chan,byte) ((0x810)+((chan)<<3)+(byte)) | ||
18 | #define ASC_ENABLE 0x801 | ||
19 | #define ASC_ENABLE_SAMPLE 0x02 | ||
20 | #define ASC_MODE 0x802 | ||
21 | #define ASC_MODE_SAMPLE 0x02 | ||
22 | |||
23 | #define ASC_VOLUME 0x806 | ||
24 | #define ASC_CHAN 0x807 /* ??? */ | ||
25 | |||
26 | |||
27 | #endif | ||
diff --git a/include/asm-m68k/mac_baboon.h b/include/asm-m68k/mac_baboon.h deleted file mode 100644 index c2a042b8c349..000000000000 --- a/include/asm-m68k/mac_baboon.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * Definitions for the "Baboon" custom IC on the PowerBook 190. | ||
3 | */ | ||
4 | |||
5 | #define BABOON_BASE (0x50F1A000) /* same as IDE controller base */ | ||
6 | |||
7 | #ifndef __ASSEMBLY__ | ||
8 | |||
9 | struct baboon { | ||
10 | char pad1[208]; /* generic IDE registers, not used here */ | ||
11 | short mb_control; /* Control register: | ||
12 | * bit 5 : slot 2 power control | ||
13 | * bit 6 : slot 1 power control | ||
14 | */ | ||
15 | char pad2[2]; | ||
16 | short mb_status; /* (0xD4) media bay status register: | ||
17 | * | ||
18 | * bit 0: ???? | ||
19 | * bit 1: IDE interrupt active? | ||
20 | * bit 2: bay status, 0 = full, 1 = empty | ||
21 | * bit 3: ???? | ||
22 | */ | ||
23 | char pad3[2]; /* (0xD6) not used */ | ||
24 | short mb_ifr; /* (0xD8) media bay interrupt flags register: | ||
25 | * | ||
26 | * bit 0: ???? | ||
27 | * bit 1: IDE controller interrupt | ||
28 | * bit 2: media bay status change interrupt | ||
29 | */ | ||
30 | }; | ||
31 | |||
32 | #endif /* __ASSEMBLY **/ | ||
diff --git a/include/asm-m68k/mac_iop.h b/include/asm-m68k/mac_iop.h deleted file mode 100644 index a2c7e6fcca38..000000000000 --- a/include/asm-m68k/mac_iop.h +++ /dev/null | |||
@@ -1,162 +0,0 @@ | |||
1 | /* | ||
2 | * I/O Processor (IOP) defines and structures, mostly snagged from A/UX | ||
3 | * header files. | ||
4 | * | ||
5 | * The original header from which this was taken is copyrighted. I've done some | ||
6 | * rewriting (in fact my changes make this a bit more readable, IMHO) but some | ||
7 | * more should be done. | ||
8 | */ | ||
9 | |||
10 | /* | ||
11 | * This is the base address of the IOPs. Use this as the address of | ||
12 | * a "struct iop" (see below) to see where the actual registers fall. | ||
13 | */ | ||
14 | |||
15 | #define SCC_IOP_BASE_IIFX (0x50F04000) | ||
16 | #define ISM_IOP_BASE_IIFX (0x50F12000) | ||
17 | |||
18 | #define SCC_IOP_BASE_QUADRA (0x50F0C000) | ||
19 | #define ISM_IOP_BASE_QUADRA (0x50F1E000) | ||
20 | |||
21 | /* IOP status/control register bits: */ | ||
22 | |||
23 | #define IOP_BYPASS 0x01 /* bypass-mode hardware access */ | ||
24 | #define IOP_AUTOINC 0x02 /* allow autoincrement of ramhi/lo */ | ||
25 | #define IOP_RUN 0x04 /* set to 0 to reset IOP chip */ | ||
26 | #define IOP_IRQ 0x08 /* generate IRQ to IOP if 1 */ | ||
27 | #define IOP_INT0 0x10 /* intr priority from IOP to host */ | ||
28 | #define IOP_INT1 0x20 /* intr priority from IOP to host */ | ||
29 | #define IOP_HWINT 0x40 /* IRQ from hardware; bypass mode only */ | ||
30 | #define IOP_DMAINACTIVE 0x80 /* no DMA request active; bypass mode only */ | ||
31 | |||
32 | #define NUM_IOPS 2 | ||
33 | #define NUM_IOP_CHAN 7 | ||
34 | #define NUM_IOP_MSGS NUM_IOP_CHAN*8 | ||
35 | #define IOP_MSG_LEN 32 | ||
36 | |||
37 | /* IOP reference numbers, used by the globally-visible iop_xxx functions */ | ||
38 | |||
39 | #define IOP_NUM_SCC 0 | ||
40 | #define IOP_NUM_ISM 1 | ||
41 | |||
42 | /* IOP channel states */ | ||
43 | |||
44 | #define IOP_MSG_IDLE 0 /* idle */ | ||
45 | #define IOP_MSG_NEW 1 /* new message sent */ | ||
46 | #define IOP_MSG_RCVD 2 /* message received; processing */ | ||
47 | #define IOP_MSG_COMPLETE 3 /* message processing complete */ | ||
48 | |||
49 | /* IOP message status codes */ | ||
50 | |||
51 | #define IOP_MSGSTATUS_UNUSED 0 /* Unusued message structure */ | ||
52 | #define IOP_MSGSTATUS_WAITING 1 /* waiting for channel */ | ||
53 | #define IOP_MSGSTATUS_SENT 2 /* message sent, awaiting reply */ | ||
54 | #define IOP_MSGSTATUS_COMPLETE 3 /* message complete and reply rcvd */ | ||
55 | #define IOP_MSGSTATUS_UNSOL 6 /* message is unsolicited */ | ||
56 | |||
57 | /* IOP memory addresses of the members of the mac_iop_kernel structure. */ | ||
58 | |||
59 | #define IOP_ADDR_MAX_SEND_CHAN 0x0200 | ||
60 | #define IOP_ADDR_SEND_STATE 0x0201 | ||
61 | #define IOP_ADDR_PATCH_CTRL 0x021F | ||
62 | #define IOP_ADDR_SEND_MSG 0x0220 | ||
63 | #define IOP_ADDR_MAX_RECV_CHAN 0x0300 | ||
64 | #define IOP_ADDR_RECV_STATE 0x0301 | ||
65 | #define IOP_ADDR_ALIVE 0x031F | ||
66 | #define IOP_ADDR_RECV_MSG 0x0320 | ||
67 | |||
68 | #ifndef __ASSEMBLY__ | ||
69 | |||
70 | /* | ||
71 | * IOP Control registers, staggered because in usual Apple style they were | ||
72 | * too lazy to decode the A0 bit. This structure is assumed to begin at | ||
73 | * one of the xxx_IOP_BASE addresses given above. | ||
74 | */ | ||
75 | |||
76 | struct mac_iop { | ||
77 | __u8 ram_addr_hi; /* shared RAM address hi byte */ | ||
78 | __u8 pad0; | ||
79 | __u8 ram_addr_lo; /* shared RAM address lo byte */ | ||
80 | __u8 pad1; | ||
81 | __u8 status_ctrl; /* status/control register */ | ||
82 | __u8 pad2[3]; | ||
83 | __u8 ram_data; /* RAM data byte at ramhi/lo */ | ||
84 | |||
85 | __u8 pad3[23]; | ||
86 | |||
87 | /* Bypass-mode hardware access registers */ | ||
88 | |||
89 | union { | ||
90 | struct { /* SCC registers */ | ||
91 | __u8 sccb_cmd; /* SCC B command reg */ | ||
92 | __u8 pad4; | ||
93 | __u8 scca_cmd; /* SCC A command reg */ | ||
94 | __u8 pad5; | ||
95 | __u8 sccb_data; /* SCC B data */ | ||
96 | __u8 pad6; | ||
97 | __u8 scca_data; /* SCC A data */ | ||
98 | } scc_regs; | ||
99 | |||
100 | struct { /* ISM registers */ | ||
101 | __u8 wdata; /* write a data byte */ | ||
102 | __u8 pad7; | ||
103 | __u8 wmark; /* write a mark byte */ | ||
104 | __u8 pad8; | ||
105 | __u8 wcrc; /* write 2-byte crc to disk */ | ||
106 | __u8 pad9; | ||
107 | __u8 wparams; /* write the param regs */ | ||
108 | __u8 pad10; | ||
109 | __u8 wphase; /* write the phase states & dirs */ | ||
110 | __u8 pad11; | ||
111 | __u8 wsetup; /* write the setup register */ | ||
112 | __u8 pad12; | ||
113 | __u8 wzeroes; /* mode reg: 1's clr bits, 0's are x */ | ||
114 | __u8 pad13; | ||
115 | __u8 wones; /* mode reg: 1's set bits, 0's are x */ | ||
116 | __u8 pad14; | ||
117 | __u8 rdata; /* read a data byte */ | ||
118 | __u8 pad15; | ||
119 | __u8 rmark; /* read a mark byte */ | ||
120 | __u8 pad16; | ||
121 | __u8 rerror; /* read the error register */ | ||
122 | __u8 pad17; | ||
123 | __u8 rparams; /* read the param regs */ | ||
124 | __u8 pad18; | ||
125 | __u8 rphase; /* read the phase states & dirs */ | ||
126 | __u8 pad19; | ||
127 | __u8 rsetup; /* read the setup register */ | ||
128 | __u8 pad20; | ||
129 | __u8 rmode; /* read the mode register */ | ||
130 | __u8 pad21; | ||
131 | __u8 rhandshake; /* read the handshake register */ | ||
132 | } ism_regs; | ||
133 | } b; | ||
134 | }; | ||
135 | |||
136 | /* This structure is used to track IOP messages in the Linux kernel */ | ||
137 | |||
138 | struct iop_msg { | ||
139 | struct iop_msg *next; /* next message in queue or NULL */ | ||
140 | uint iop_num; /* IOP number */ | ||
141 | uint channel; /* channel number */ | ||
142 | void *caller_priv; /* caller private data */ | ||
143 | int status; /* status of this message */ | ||
144 | __u8 message[IOP_MSG_LEN]; /* the message being sent/received */ | ||
145 | __u8 reply[IOP_MSG_LEN]; /* the reply to the message */ | ||
146 | void (*handler)(struct iop_msg *); | ||
147 | /* function to call when reply recvd */ | ||
148 | }; | ||
149 | |||
150 | extern int iop_scc_present,iop_ism_present; | ||
151 | |||
152 | extern int iop_listen(uint, uint, | ||
153 | void (*handler)(struct iop_msg *), | ||
154 | const char *); | ||
155 | extern int iop_send_message(uint, uint, void *, uint, __u8 *, | ||
156 | void (*)(struct iop_msg *)); | ||
157 | extern void iop_complete_message(struct iop_msg *); | ||
158 | extern void iop_upload_code(uint, __u8 *, uint, __u16); | ||
159 | extern void iop_download_code(uint, __u8 *, uint, __u16); | ||
160 | extern __u8 *iop_compare_code(uint, __u8 *, uint, __u16); | ||
161 | |||
162 | #endif /* __ASSEMBLY__ */ | ||
diff --git a/include/asm-m68k/mac_mouse.h b/include/asm-m68k/mac_mouse.h deleted file mode 100644 index 39a5c292eaee..000000000000 --- a/include/asm-m68k/mac_mouse.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #ifndef _ASM_MAC_MOUSE_H | ||
2 | #define _ASM_MAC_MOUSE_H | ||
3 | |||
4 | /* | ||
5 | * linux/include/asm-m68k/mac_mouse.h | ||
6 | * header file for Macintosh ADB mouse driver | ||
7 | * 27-10-97 Michael Schmitz | ||
8 | * copied from: | ||
9 | * header file for Atari Mouse driver | ||
10 | * by Robert de Vries (robert@and.nl) on 19Jul93 | ||
11 | */ | ||
12 | |||
13 | struct mouse_status { | ||
14 | char buttons; | ||
15 | short dx; | ||
16 | short dy; | ||
17 | int ready; | ||
18 | int active; | ||
19 | wait_queue_head_t wait; | ||
20 | struct fasync_struct *fasyncptr; | ||
21 | }; | ||
22 | |||
23 | #endif | ||
diff --git a/include/asm-m68k/mac_oss.h b/include/asm-m68k/mac_oss.h deleted file mode 100644 index 7221f7251934..000000000000 --- a/include/asm-m68k/mac_oss.h +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | /* | ||
2 | * OSS | ||
3 | * | ||
4 | * This is used in place of VIA2 on the IIfx. | ||
5 | */ | ||
6 | |||
7 | #define OSS_BASE (0x50f1a000) | ||
8 | |||
9 | /* | ||
10 | * Interrupt level offsets for mac_oss->irq_level | ||
11 | */ | ||
12 | |||
13 | #define OSS_NUBUS0 0 | ||
14 | #define OSS_NUBUS1 1 | ||
15 | #define OSS_NUBUS2 2 | ||
16 | #define OSS_NUBUS3 3 | ||
17 | #define OSS_NUBUS4 4 | ||
18 | #define OSS_NUBUS5 5 | ||
19 | #define OSS_IOPISM 6 | ||
20 | #define OSS_IOPSCC 7 | ||
21 | #define OSS_SOUND 8 | ||
22 | #define OSS_SCSI 9 | ||
23 | #define OSS_60HZ 10 | ||
24 | #define OSS_VIA1 11 | ||
25 | #define OSS_UNUSED1 12 | ||
26 | #define OSS_UNUSED2 13 | ||
27 | #define OSS_PARITY 14 | ||
28 | #define OSS_UNUSED3 15 | ||
29 | |||
30 | #define OSS_NUM_SOURCES 16 | ||
31 | |||
32 | /* | ||
33 | * Pending interrupt bits in mac_oss->irq_pending | ||
34 | */ | ||
35 | |||
36 | #define OSS_IP_NUBUS0 0x0001 | ||
37 | #define OSS_IP_NUBUS1 0x0002 | ||
38 | #define OSS_IP_NUBUS2 0x0004 | ||
39 | #define OSS_IP_NUBUS3 0x0008 | ||
40 | #define OSS_IP_NUBUS4 0x0010 | ||
41 | #define OSS_IP_NUBUS5 0x0020 | ||
42 | #define OSS_IP_IOPISM 0x0040 | ||
43 | #define OSS_IP_IOPSCC 0x0080 | ||
44 | #define OSS_IP_SOUND 0x0100 | ||
45 | #define OSS_IP_SCSI 0x0200 | ||
46 | #define OSS_IP_60HZ 0x0400 | ||
47 | #define OSS_IP_VIA1 0x0800 | ||
48 | #define OSS_IP_UNUSED1 0x1000 | ||
49 | #define OSS_IP_UNUSED2 0x2000 | ||
50 | #define OSS_IP_PARITY 0x4000 | ||
51 | #define OSS_IP_UNUSED3 0x8000 | ||
52 | |||
53 | #define OSS_IP_NUBUS (OSS_IP_NUBUS0|OSS_IP_NUBUS1|OSS_IP_NUBUS2|OSS_IP_NUBUS3|OSS_IP_NUBUS4|OSS_IP_NUBUS5) | ||
54 | |||
55 | /* | ||
56 | * Rom Control Register | ||
57 | */ | ||
58 | |||
59 | #define OSS_POWEROFF 0x80 | ||
60 | |||
61 | /* | ||
62 | * OSS Interrupt levels for various sub-systems | ||
63 | * | ||
64 | * This mapping is layed out with two things in mind: first, we try to keep | ||
65 | * things on their own levels to avoid having to do double-dispatches. Second, | ||
66 | * the levels match as closely as possible the alternate IRQ mapping mode (aka | ||
67 | * "A/UX mode") available on some VIA machines. | ||
68 | */ | ||
69 | |||
70 | #define OSS_IRQLEV_DISABLED 0 | ||
71 | #define OSS_IRQLEV_IOPISM 1 /* ADB? */ | ||
72 | #define OSS_IRQLEV_SCSI IRQ_AUTO_2 | ||
73 | #define OSS_IRQLEV_NUBUS IRQ_AUTO_3 /* keep this on its own level */ | ||
74 | #define OSS_IRQLEV_IOPSCC IRQ_AUTO_4 /* matches VIA alternate mapping */ | ||
75 | #define OSS_IRQLEV_SOUND IRQ_AUTO_5 /* matches VIA alternate mapping */ | ||
76 | #define OSS_IRQLEV_60HZ 6 /* matches VIA alternate mapping */ | ||
77 | #define OSS_IRQLEV_VIA1 IRQ_AUTO_6 /* matches VIA alternate mapping */ | ||
78 | #define OSS_IRQLEV_PARITY 7 /* matches VIA alternate mapping */ | ||
79 | |||
80 | #ifndef __ASSEMBLY__ | ||
81 | |||
82 | struct mac_oss { | ||
83 | __u8 irq_level[0x10]; /* [0x000-0x00f] Interrupt levels */ | ||
84 | __u8 padding0[0x1F2]; /* [0x010-0x201] IO space filler */ | ||
85 | __u16 irq_pending; /* [0x202-0x203] pending interrupts bits */ | ||
86 | __u8 rom_ctrl; /* [0x204-0x204] ROM cntl reg (for poweroff) */ | ||
87 | __u8 padding1[0x2]; /* [0x205-0x206] currently unused by A/UX */ | ||
88 | __u8 ack_60hz; /* [0x207-0x207] 60 Hz ack. */ | ||
89 | }; | ||
90 | |||
91 | extern volatile struct mac_oss *oss; | ||
92 | extern int oss_present; | ||
93 | |||
94 | #endif /* __ASSEMBLY__ */ | ||
diff --git a/include/asm-m68k/mac_psc.h b/include/asm-m68k/mac_psc.h deleted file mode 100644 index 7808bb0b2323..000000000000 --- a/include/asm-m68k/mac_psc.h +++ /dev/null | |||
@@ -1,248 +0,0 @@ | |||
1 | /* | ||
2 | * Apple Peripheral System Controller (PSC) | ||
3 | * | ||
4 | * The PSC is used on the AV Macs to control IO functions not handled | ||
5 | * by the VIAs (Ethernet, DSP, SCC, Sound). This includes nine DMA | ||
6 | * channels. | ||
7 | * | ||
8 | * The first seven DMA channels appear to be "one-shot" and are actually | ||
9 | * sets of two channels; one member is active while the other is being | ||
10 | * configured, and then you flip the active member and start all over again. | ||
11 | * The one-shot channels are grouped together and are: | ||
12 | * | ||
13 | * 1. SCSI | ||
14 | * 2. Ethernet Read | ||
15 | * 3. Ethernet Write | ||
16 | * 4. Floppy Disk Controller | ||
17 | * 5. SCC Channel A Receive | ||
18 | * 6. SCC Channel B Receive | ||
19 | * 7. SCC Channel A Transmit | ||
20 | * | ||
21 | * The remaining two channels are handled somewhat differently. They appear | ||
22 | * to be closely tied and share one set of registers. They also seem to run | ||
23 | * continuously, although how you keep the buffer filled in this scenario is | ||
24 | * not understood as there seems to be only one input and one output buffer | ||
25 | * pointer. | ||
26 | * | ||
27 | * Much of this was extrapolated from what was known about the Ethernet | ||
28 | * registers and subsequently confirmed using MacsBug (ie by pinging the | ||
29 | * machine with easy-to-find patterns and looking for them in the DMA | ||
30 | * buffers, or by sending a file over the serial ports and finding the | ||
31 | * file in the buffers.) | ||
32 | * | ||
33 | * 1999-05-25 (jmt) | ||
34 | */ | ||
35 | |||
36 | #define PSC_BASE (0x50F31000) | ||
37 | |||
38 | /* | ||
39 | * The IER/IFR registers work like the VIA, except that it has 4 | ||
40 | * of them each on different interrupt levels, and each register | ||
41 | * set only seems to handle four interrupts instead of seven. | ||
42 | * | ||
43 | * To access a particular set of registers, add 0xn0 to the base | ||
44 | * where n = 3,4,5 or 6. | ||
45 | */ | ||
46 | |||
47 | #define pIFRbase 0x100 | ||
48 | #define pIERbase 0x104 | ||
49 | |||
50 | /* | ||
51 | * One-shot DMA control registers | ||
52 | */ | ||
53 | |||
54 | #define PSC_MYSTERY 0x804 | ||
55 | |||
56 | #define PSC_CTL_BASE 0xC00 | ||
57 | |||
58 | #define PSC_SCSI_CTL 0xC00 | ||
59 | #define PSC_ENETRD_CTL 0xC10 | ||
60 | #define PSC_ENETWR_CTL 0xC20 | ||
61 | #define PSC_FDC_CTL 0xC30 | ||
62 | #define PSC_SCCA_CTL 0xC40 | ||
63 | #define PSC_SCCB_CTL 0xC50 | ||
64 | #define PSC_SCCATX_CTL 0xC60 | ||
65 | |||
66 | /* | ||
67 | * DMA channels. Add +0x10 for the second channel in the set. | ||
68 | * You're supposed to use one channel while the other runs and | ||
69 | * then flip channels and do the whole thing again. | ||
70 | */ | ||
71 | |||
72 | #define PSC_ADDR_BASE 0x1000 | ||
73 | #define PSC_LEN_BASE 0x1004 | ||
74 | #define PSC_CMD_BASE 0x1008 | ||
75 | |||
76 | #define PSC_SET0 0x00 | ||
77 | #define PSC_SET1 0x10 | ||
78 | |||
79 | #define PSC_SCSI_ADDR 0x1000 /* confirmed */ | ||
80 | #define PSC_SCSI_LEN 0x1004 /* confirmed */ | ||
81 | #define PSC_SCSI_CMD 0x1008 /* confirmed */ | ||
82 | #define PSC_ENETRD_ADDR 0x1020 /* confirmed */ | ||
83 | #define PSC_ENETRD_LEN 0x1024 /* confirmed */ | ||
84 | #define PSC_ENETRD_CMD 0x1028 /* confirmed */ | ||
85 | #define PSC_ENETWR_ADDR 0x1040 /* confirmed */ | ||
86 | #define PSC_ENETWR_LEN 0x1044 /* confirmed */ | ||
87 | #define PSC_ENETWR_CMD 0x1048 /* confirmed */ | ||
88 | #define PSC_FDC_ADDR 0x1060 /* strongly suspected */ | ||
89 | #define PSC_FDC_LEN 0x1064 /* strongly suspected */ | ||
90 | #define PSC_FDC_CMD 0x1068 /* strongly suspected */ | ||
91 | #define PSC_SCCA_ADDR 0x1080 /* confirmed */ | ||
92 | #define PSC_SCCA_LEN 0x1084 /* confirmed */ | ||
93 | #define PSC_SCCA_CMD 0x1088 /* confirmed */ | ||
94 | #define PSC_SCCB_ADDR 0x10A0 /* confirmed */ | ||
95 | #define PSC_SCCB_LEN 0x10A4 /* confirmed */ | ||
96 | #define PSC_SCCB_CMD 0x10A8 /* confirmed */ | ||
97 | #define PSC_SCCATX_ADDR 0x10C0 /* confirmed */ | ||
98 | #define PSC_SCCATX_LEN 0x10C4 /* confirmed */ | ||
99 | #define PSC_SCCATX_CMD 0x10C8 /* confirmed */ | ||
100 | |||
101 | /* | ||
102 | * Free-running DMA registers. The only part known for sure are the bits in | ||
103 | * the control register, the buffer addresses and the buffer length. Everything | ||
104 | * else is anybody's guess. | ||
105 | * | ||
106 | * These registers seem to be mirrored every thirty-two bytes up until offset | ||
107 | * 0x300. It's safe to assume then that a new set of registers starts there. | ||
108 | */ | ||
109 | |||
110 | #define PSC_SND_CTL 0x200 /* | ||
111 | * [ 16-bit ] | ||
112 | * Sound (Singer?) control register. | ||
113 | * | ||
114 | * bit 0 : ???? | ||
115 | * bit 1 : ???? | ||
116 | * bit 2 : Set to one to enable sound | ||
117 | * output. Possibly a mute flag. | ||
118 | * bit 3 : ???? | ||
119 | * bit 4 : ???? | ||
120 | * bit 5 : ???? | ||
121 | * bit 6 : Set to one to enable pass-thru | ||
122 | * audio. In this mode the audio data | ||
123 | * seems to appear in both the input | ||
124 | * buffer and the output buffer. | ||
125 | * bit 7 : Set to one to activate the | ||
126 | * sound input DMA or zero to | ||
127 | * disable it. | ||
128 | * bit 8 : Set to one to activate the | ||
129 | * sound output DMA or zero to | ||
130 | * disable it. | ||
131 | * bit 9 : \ | ||
132 | * bit 11 : | | ||
133 | * These two bits control the sample | ||
134 | * rate. Usually set to binary 10 and | ||
135 | * MacOS 8.0 says I'm at 48 KHz. Using | ||
136 | * a binary value of 01 makes things | ||
137 | * sound about 1/2 speed (24 KHz?) and | ||
138 | * binary 00 is slower still (22 KHz?) | ||
139 | * | ||
140 | * Setting this to 0x0000 is a good way to | ||
141 | * kill all DMA at boot time so that the | ||
142 | * PSC won't overwrite the kernel image | ||
143 | * with sound data. | ||
144 | */ | ||
145 | |||
146 | /* | ||
147 | * 0x0202 - 0x0203 is unused. Writing there | ||
148 | * seems to clobber the control register. | ||
149 | */ | ||
150 | |||
151 | #define PSC_SND_SOURCE 0x204 /* | ||
152 | * [ 32-bit ] | ||
153 | * Controls input source and volume: | ||
154 | * | ||
155 | * bits 12-15 : input source volume, 0 - F | ||
156 | * bits 16-19 : unknown, always 0x5 | ||
157 | * bits 20-23 : input source selection: | ||
158 | * 0x3 = CD Audio | ||
159 | * 0x4 = External Audio | ||
160 | * | ||
161 | * The volume is definitely not the general | ||
162 | * output volume as it doesn't affect the | ||
163 | * alert sound volume. | ||
164 | */ | ||
165 | #define PSC_SND_STATUS1 0x208 /* | ||
166 | * [ 32-bit ] | ||
167 | * Appears to be a read-only status register. | ||
168 | * The usual value is 0x00400002. | ||
169 | */ | ||
170 | #define PSC_SND_HUH3 0x20C /* | ||
171 | * [ 16-bit ] | ||
172 | * Unknown 16-bit value, always 0x0000. | ||
173 | */ | ||
174 | #define PSC_SND_BITS2GO 0x20E /* | ||
175 | * [ 16-bit ] | ||
176 | * Counts down to zero from some constant | ||
177 | * value. The value appears to be the | ||
178 | * number of _bits_ remaining before the | ||
179 | * buffer is full, which would make sense | ||
180 | * since Apple's docs say the sound DMA | ||
181 | * channels are 1 bit wide. | ||
182 | */ | ||
183 | #define PSC_SND_INADDR 0x210 /* | ||
184 | * [ 32-bit ] | ||
185 | * Address of the sound input DMA buffer | ||
186 | */ | ||
187 | #define PSC_SND_OUTADDR 0x214 /* | ||
188 | * [ 32-bit ] | ||
189 | * Address of the sound output DMA buffer | ||
190 | */ | ||
191 | #define PSC_SND_LEN 0x218 /* | ||
192 | * [ 16-bit ] | ||
193 | * Length of both buffers in eight-byte units. | ||
194 | */ | ||
195 | #define PSC_SND_HUH4 0x21A /* | ||
196 | * [ 16-bit ] | ||
197 | * Unknown, always 0x0000. | ||
198 | */ | ||
199 | #define PSC_SND_STATUS2 0x21C /* | ||
200 | * [ 16-bit ] | ||
201 | * Appears to e a read-only status register. | ||
202 | * The usual value is 0x0200. | ||
203 | */ | ||
204 | #define PSC_SND_HUH5 0x21E /* | ||
205 | * [ 16-bit ] | ||
206 | * Unknown, always 0x0000. | ||
207 | */ | ||
208 | |||
209 | #ifndef __ASSEMBLY__ | ||
210 | |||
211 | extern volatile __u8 *psc; | ||
212 | extern int psc_present; | ||
213 | |||
214 | /* | ||
215 | * Access functions | ||
216 | */ | ||
217 | |||
218 | static inline void psc_write_byte(int offset, __u8 data) | ||
219 | { | ||
220 | *((volatile __u8 *)(psc + offset)) = data; | ||
221 | } | ||
222 | |||
223 | static inline void psc_write_word(int offset, __u16 data) | ||
224 | { | ||
225 | *((volatile __u16 *)(psc + offset)) = data; | ||
226 | } | ||
227 | |||
228 | static inline void psc_write_long(int offset, __u32 data) | ||
229 | { | ||
230 | *((volatile __u32 *)(psc + offset)) = data; | ||
231 | } | ||
232 | |||
233 | static inline u8 psc_read_byte(int offset) | ||
234 | { | ||
235 | return *((volatile __u8 *)(psc + offset)); | ||
236 | } | ||
237 | |||
238 | static inline u16 psc_read_word(int offset) | ||
239 | { | ||
240 | return *((volatile __u16 *)(psc + offset)); | ||
241 | } | ||
242 | |||
243 | static inline u32 psc_read_long(int offset) | ||
244 | { | ||
245 | return *((volatile __u32 *)(psc + offset)); | ||
246 | } | ||
247 | |||
248 | #endif /* __ASSEMBLY__ */ | ||
diff --git a/include/asm-m68k/mac_via.h b/include/asm-m68k/mac_via.h deleted file mode 100644 index 39afb438b656..000000000000 --- a/include/asm-m68k/mac_via.h +++ /dev/null | |||
@@ -1,267 +0,0 @@ | |||
1 | /* | ||
2 | * 6522 Versatile Interface Adapter (VIA) | ||
3 | * | ||
4 | * There are two of these on the Mac II. Some IRQ's are vectored | ||
5 | * via them as are assorted bits and bobs - eg rtc, adb. The picture | ||
6 | * is a bit incomplete as the Mac documentation doesn't cover this well | ||
7 | */ | ||
8 | |||
9 | #ifndef _ASM_MAC_VIA_H_ | ||
10 | #define _ASM_MAC_VIA_H_ | ||
11 | |||
12 | /* | ||
13 | * Base addresses for the VIAs. There are two in every machine, | ||
14 | * although on some machines the second is an RBV or an OSS. | ||
15 | * The OSS is different enough that it's handled separately. | ||
16 | * | ||
17 | * Do not use these values directly; use the via1 and via2 variables | ||
18 | * instead (and don't forget to check rbv_present when using via2!) | ||
19 | */ | ||
20 | |||
21 | #define VIA1_BASE (0x50F00000) | ||
22 | #define VIA2_BASE (0x50F02000) | ||
23 | #define RBV_BASE (0x50F26000) | ||
24 | |||
25 | /* | ||
26 | * Not all of these are true post MacII I think. | ||
27 | * CSA: probably the ones CHRP marks as 'unused' change purposes | ||
28 | * when the IWM becomes the SWIM. | ||
29 | * http://www.rs6000.ibm.com/resource/technology/chrpio/via5.mak.html | ||
30 | * ftp://ftp.austin.ibm.com/pub/technology/spec/chrp/inwork/CHRP_IORef_1.0.pdf | ||
31 | * | ||
32 | * also, http://developer.apple.com/technotes/hw/hw_09.html claims the | ||
33 | * following changes for IIfx: | ||
34 | * VIA1A_vSccWrReq not available and that VIA1A_vSync has moved to an IOP. | ||
35 | * Also, "All of the functionality of VIA2 has been moved to other chips". | ||
36 | */ | ||
37 | |||
38 | #define VIA1A_vSccWrReq 0x80 /* SCC write. (input) | ||
39 | * [CHRP] SCC WREQ: Reflects the state of the | ||
40 | * Wait/Request pins from the SCC. | ||
41 | * [Macintosh Family Hardware] | ||
42 | * as CHRP on SE/30,II,IIx,IIcx,IIci. | ||
43 | * on IIfx, "0 means an active request" | ||
44 | */ | ||
45 | #define VIA1A_vRev8 0x40 /* Revision 8 board ??? | ||
46 | * [CHRP] En WaitReqB: Lets the WaitReq_L | ||
47 | * signal from port B of the SCC appear on | ||
48 | * the PA7 input pin. Output. | ||
49 | * [Macintosh Family] On the SE/30, this | ||
50 | * is the bit to flip screen buffers. | ||
51 | * 0=alternate, 1=main. | ||
52 | * on II,IIx,IIcx,IIci,IIfx this is a bit | ||
53 | * for Rev ID. 0=II,IIx, 1=IIcx,IIci,IIfx | ||
54 | */ | ||
55 | #define VIA1A_vHeadSel 0x20 /* Head select for IWM. | ||
56 | * [CHRP] unused. | ||
57 | * [Macintosh Family] "Floppy disk | ||
58 | * state-control line SEL" on all but IIfx | ||
59 | */ | ||
60 | #define VIA1A_vOverlay 0x10 /* [Macintosh Family] On SE/30,II,IIx,IIcx | ||
61 | * this bit enables the "Overlay" address | ||
62 | * map in the address decoders as it is on | ||
63 | * reset for mapping the ROM over the reset | ||
64 | * vector. 1=use overlay map. | ||
65 | * On the IIci,IIfx it is another bit of the | ||
66 | * CPU ID: 0=normal IIci, 1=IIci with parity | ||
67 | * feature or IIfx. | ||
68 | * [CHRP] En WaitReqA: Lets the WaitReq_L | ||
69 | * signal from port A of the SCC appear | ||
70 | * on the PA7 input pin (CHRP). Output. | ||
71 | * [MkLinux] "Drive Select" | ||
72 | * (with 0x20 being 'disk head select') | ||
73 | */ | ||
74 | #define VIA1A_vSync 0x08 /* [CHRP] Sync Modem: modem clock select: | ||
75 | * 1: select the external serial clock to | ||
76 | * drive the SCC's /RTxCA pin. | ||
77 | * 0: Select the 3.6864MHz clock to drive | ||
78 | * the SCC cell. | ||
79 | * [Macintosh Family] Correct on all but IIfx | ||
80 | */ | ||
81 | |||
82 | /* Macintosh Family Hardware sez: bits 0-2 of VIA1A are volume control | ||
83 | * on Macs which had the PWM sound hardware. Reserved on newer models. | ||
84 | * On IIci,IIfx, bits 1-2 are the rest of the CPU ID: | ||
85 | * bit 2: 1=IIci, 0=IIfx | ||
86 | * bit 1: 1 on both IIci and IIfx. | ||
87 | * MkLinux sez bit 0 is 'burnin flag' in this case. | ||
88 | * CHRP sez: VIA1A bits 0-2 and 5 are 'unused': if programmed as | ||
89 | * inputs, these bits will read 0. | ||
90 | */ | ||
91 | #define VIA1A_vVolume 0x07 /* Audio volume mask for PWM */ | ||
92 | #define VIA1A_CPUID0 0x02 /* CPU id bit 0 on RBV, others */ | ||
93 | #define VIA1A_CPUID1 0x04 /* CPU id bit 0 on RBV, others */ | ||
94 | #define VIA1A_CPUID2 0x10 /* CPU id bit 0 on RBV, others */ | ||
95 | #define VIA1A_CPUID3 0x40 /* CPU id bit 0 on RBV, others */ | ||
96 | |||
97 | /* Info on VIA1B is from Macintosh Family Hardware & MkLinux. | ||
98 | * CHRP offers no info. */ | ||
99 | #define VIA1B_vSound 0x80 /* Sound enable (for compatibility with | ||
100 | * PWM hardware) 0=enabled. | ||
101 | * Also, on IIci w/parity, shows parity error | ||
102 | * 0=error, 1=OK. */ | ||
103 | #define VIA1B_vMystery 0x40 /* On IIci, parity enable. 0=enabled,1=disabled | ||
104 | * On SE/30, vertical sync interrupt enable. | ||
105 | * 0=enabled. This vSync interrupt shows up | ||
106 | * as a slot $E interrupt. */ | ||
107 | #define VIA1B_vADBS2 0x20 /* ADB state input bit 1 (unused on IIfx) */ | ||
108 | #define VIA1B_vADBS1 0x10 /* ADB state input bit 0 (unused on IIfx) */ | ||
109 | #define VIA1B_vADBInt 0x08 /* ADB interrupt 0=interrupt (unused on IIfx)*/ | ||
110 | #define VIA1B_vRTCEnb 0x04 /* Enable Real time clock. 0=enabled. */ | ||
111 | #define VIA1B_vRTCClk 0x02 /* Real time clock serial-clock line. */ | ||
112 | #define VIA1B_vRTCData 0x01 /* Real time clock serial-data line. */ | ||
113 | |||
114 | /* MkLinux defines the following "VIA1 Register B contents where they | ||
115 | * differ from standard VIA1". From the naming scheme, we assume they | ||
116 | * correspond to a VIA work-alike named 'EVR'. */ | ||
117 | #define EVRB_XCVR 0x08 /* XCVR_SESSION* */ | ||
118 | #define EVRB_FULL 0x10 /* VIA_FULL */ | ||
119 | #define EVRB_SYSES 0x20 /* SYS_SESSION */ | ||
120 | #define EVRB_AUXIE 0x00 /* Enable A/UX Interrupt Scheme */ | ||
121 | #define EVRB_AUXID 0x40 /* Disable A/UX Interrupt Scheme */ | ||
122 | #define EVRB_SFTWRIE 0x00 /* Software Interrupt ReQuest */ | ||
123 | #define EVRB_SFTWRID 0x80 /* Software Interrupt ReQuest */ | ||
124 | |||
125 | /* | ||
126 | * VIA2 A register is the interrupt lines raised off the nubus | ||
127 | * slots. | ||
128 | * The below info is from 'Macintosh Family Hardware.' | ||
129 | * MkLinux calls the 'IIci internal video IRQ' below the 'RBV slot 0 irq.' | ||
130 | * It also notes that the slot $9 IRQ is the 'Ethernet IRQ' and | ||
131 | * defines the 'Video IRQ' as 0x40 for the 'EVR' VIA work-alike. | ||
132 | * Perhaps OSS uses vRAM1 and vRAM2 for ADB. | ||
133 | */ | ||
134 | |||
135 | #define VIA2A_vRAM1 0x80 /* RAM size bit 1 (IIci: reserved) */ | ||
136 | #define VIA2A_vRAM0 0x40 /* RAM size bit 0 (IIci: internal video IRQ) */ | ||
137 | #define VIA2A_vIRQE 0x20 /* IRQ from slot $E */ | ||
138 | #define VIA2A_vIRQD 0x10 /* IRQ from slot $D */ | ||
139 | #define VIA2A_vIRQC 0x08 /* IRQ from slot $C */ | ||
140 | #define VIA2A_vIRQB 0x04 /* IRQ from slot $B */ | ||
141 | #define VIA2A_vIRQA 0x02 /* IRQ from slot $A */ | ||
142 | #define VIA2A_vIRQ9 0x01 /* IRQ from slot $9 */ | ||
143 | |||
144 | /* RAM size bits decoded as follows: | ||
145 | * bit1 bit0 size of ICs in bank A | ||
146 | * 0 0 256 kbit | ||
147 | * 0 1 1 Mbit | ||
148 | * 1 0 4 Mbit | ||
149 | * 1 1 16 Mbit | ||
150 | */ | ||
151 | |||
152 | /* | ||
153 | * Register B has the fun stuff in it | ||
154 | */ | ||
155 | |||
156 | #define VIA2B_vVBL 0x80 /* VBL output to VIA1 (60.15Hz) driven by | ||
157 | * timer T1. | ||
158 | * on IIci, parity test: 0=test mode. | ||
159 | * [MkLinux] RBV_PARODD: 1=odd,0=even. */ | ||
160 | #define VIA2B_vSndJck 0x40 /* External sound jack status. | ||
161 | * 0=plug is inserted. On SE/30, always 0 */ | ||
162 | #define VIA2B_vTfr0 0x20 /* Transfer mode bit 0 ack from NuBus */ | ||
163 | #define VIA2B_vTfr1 0x10 /* Transfer mode bit 1 ack from NuBus */ | ||
164 | #define VIA2B_vMode32 0x08 /* 24/32bit switch - doubles as cache flush | ||
165 | * on II, AMU/PMMU control. | ||
166 | * if AMU, 0=24bit to 32bit translation | ||
167 | * if PMMU, 1=PMMU is accessing page table. | ||
168 | * on SE/30 tied low. | ||
169 | * on IIx,IIcx,IIfx, unused. | ||
170 | * on IIci/RBV, cache control. 0=flush cache. | ||
171 | */ | ||
172 | #define VIA2B_vPower 0x04 /* Power off, 0=shut off power. | ||
173 | * on SE/30 this signal sent to PDS card. */ | ||
174 | #define VIA2B_vBusLk 0x02 /* Lock NuBus transactions, 0=locked. | ||
175 | * on SE/30 sent to PDS card. */ | ||
176 | #define VIA2B_vCDis 0x01 /* Cache control. On IIci, 1=disable cache card | ||
177 | * on others, 0=disable processor's instruction | ||
178 | * and data caches. */ | ||
179 | |||
180 | /* Apple sez: http://developer.apple.com/technotes/ov/ov_04.html | ||
181 | * Another example of a valid function that has no ROM support is the use | ||
182 | * of the alternate video page for page-flipping animation. Since there | ||
183 | * is no ROM call to flip pages, it is necessary to go play with the | ||
184 | * right bit in the VIA chip (6522 Versatile Interface Adapter). | ||
185 | * [CSA: don't know which one this is, but it's one of 'em!] | ||
186 | */ | ||
187 | |||
188 | /* | ||
189 | * 6522 registers - see databook. | ||
190 | * CSA: Assignments for VIA1 confirmed from CHRP spec. | ||
191 | */ | ||
192 | |||
193 | /* partial address decode. 0xYYXX : XX part for RBV, YY part for VIA */ | ||
194 | /* Note: 15 VIA regs, 8 RBV regs */ | ||
195 | |||
196 | #define vBufB 0x0000 /* [VIA/RBV] Register B */ | ||
197 | #define vBufAH 0x0200 /* [VIA only] Buffer A, with handshake. DON'T USE! */ | ||
198 | #define vDirB 0x0400 /* [VIA only] Data Direction Register B. */ | ||
199 | #define vDirA 0x0600 /* [VIA only] Data Direction Register A. */ | ||
200 | #define vT1CL 0x0800 /* [VIA only] Timer one counter low. */ | ||
201 | #define vT1CH 0x0a00 /* [VIA only] Timer one counter high. */ | ||
202 | #define vT1LL 0x0c00 /* [VIA only] Timer one latches low. */ | ||
203 | #define vT1LH 0x0e00 /* [VIA only] Timer one latches high. */ | ||
204 | #define vT2CL 0x1000 /* [VIA only] Timer two counter low. */ | ||
205 | #define vT2CH 0x1200 /* [VIA only] Timer two counter high. */ | ||
206 | #define vSR 0x1400 /* [VIA only] Shift register. */ | ||
207 | #define vACR 0x1600 /* [VIA only] Auxilary control register. */ | ||
208 | #define vPCR 0x1800 /* [VIA only] Peripheral control register. */ | ||
209 | /* CHRP sez never ever to *write* this. | ||
210 | * Mac family says never to *change* this. | ||
211 | * In fact we need to initialize it once at start. */ | ||
212 | #define vIFR 0x1a00 /* [VIA/RBV] Interrupt flag register. */ | ||
213 | #define vIER 0x1c00 /* [VIA/RBV] Interrupt enable register. */ | ||
214 | #define vBufA 0x1e00 /* [VIA/RBV] register A (no handshake) */ | ||
215 | |||
216 | /* The RBV only decodes the bottom eight address lines; the VIA doesn't | ||
217 | * decode the bottom eight -- so vBufB | rBufB will always get you BufB */ | ||
218 | /* CSA: in fact, only bits 0,1, and 4 seem to be decoded. | ||
219 | * BUT note the values for rIER and rIFR, where the top 8 bits *do* seem | ||
220 | * to matter. In fact *all* of the top 8 bits seem to matter; | ||
221 | * setting rIER=0x1813 and rIFR=0x1803 doesn't work, either. | ||
222 | * Perhaps some sort of 'compatibility mode' is built-in? [21-May-1999] | ||
223 | */ | ||
224 | |||
225 | #define rBufB 0x0000 /* [VIA/RBV] Register B */ | ||
226 | #define rExp 0x0001 /* [RBV only] RBV future expansion (always 0) */ | ||
227 | #define rSIFR 0x0002 /* [RBV only] RBV slot interrupts register. */ | ||
228 | #define rIFR 0x1a03 /* [VIA/RBV] RBV interrupt flag register. */ | ||
229 | #define rMonP 0x0010 /* [RBV only] RBV video monitor type. */ | ||
230 | #define rChpT 0x0011 /* [RBV only] RBV test mode register (reads as 0). */ | ||
231 | #define rSIER 0x0012 /* [RBV only] RBV slot interrupt enables. */ | ||
232 | #define rIER 0x1c13 /* [VIA/RBV] RBV interrupt flag enable register. */ | ||
233 | #define rBufA rSIFR /* the 'slot interrupts register' is BufA on a VIA */ | ||
234 | |||
235 | /* | ||
236 | * Video monitor parameters, for rMonP: | ||
237 | */ | ||
238 | #define RBV_DEPTH 0x07 /* bits per pixel: 000=1,001=2,010=4,011=8 */ | ||
239 | #define RBV_MONID 0x38 /* monitor type, as below. */ | ||
240 | #define RBV_VIDOFF 0x40 /* 1 turns off onboard video */ | ||
241 | /* Supported monitor types: */ | ||
242 | #define MON_15BW (1<<3) /* 15" BW portrait. */ | ||
243 | #define MON_IIGS (2<<3) /* 12" color (modified IIGS monitor). */ | ||
244 | #define MON_15RGB (5<<3) /* 15" RGB portrait. */ | ||
245 | #define MON_12OR13 (6<<3) /* 12" BW or 13" RGB. */ | ||
246 | #define MON_NONE (7<<3) /* No monitor attached. */ | ||
247 | |||
248 | /* To clarify IER manipulations */ | ||
249 | #define IER_SET_BIT(b) (0x80 | (1<<(b)) ) | ||
250 | #define IER_CLR_BIT(b) (0x7F & (1<<(b)) ) | ||
251 | |||
252 | #ifndef __ASSEMBLY__ | ||
253 | |||
254 | extern volatile __u8 *via1,*via2; | ||
255 | extern int rbv_present,via_alt_mapping; | ||
256 | |||
257 | static inline int rbv_set_video_bpp(int bpp) | ||
258 | { | ||
259 | char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1; | ||
260 | if (!rbv_present || val<0) return -1; | ||
261 | via2[rMonP] = (via2[rMonP] & ~RBV_DEPTH) | val; | ||
262 | return 0; | ||
263 | } | ||
264 | |||
265 | #endif /* __ASSEMBLY__ */ | ||
266 | |||
267 | #endif /* _ASM_MAC_VIA_H_ */ | ||
diff --git a/include/asm-m68k/machdep.h b/include/asm-m68k/machdep.h deleted file mode 100644 index 5637dcef314e..000000000000 --- a/include/asm-m68k/machdep.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | #ifndef _M68K_MACHDEP_H | ||
2 | #define _M68K_MACHDEP_H | ||
3 | |||
4 | #include <linux/seq_file.h> | ||
5 | #include <linux/interrupt.h> | ||
6 | |||
7 | struct pt_regs; | ||
8 | struct mktime; | ||
9 | struct rtc_time; | ||
10 | struct rtc_pll_info; | ||
11 | struct buffer_head; | ||
12 | |||
13 | extern void (*mach_sched_init) (irq_handler_t handler); | ||
14 | /* machine dependent irq functions */ | ||
15 | extern void (*mach_init_IRQ) (void); | ||
16 | extern void (*mach_get_model) (char *model); | ||
17 | extern void (*mach_get_hardware_list) (struct seq_file *m); | ||
18 | /* machine dependent timer functions */ | ||
19 | extern unsigned long (*mach_gettimeoffset)(void); | ||
20 | extern int (*mach_hwclk)(int, struct rtc_time*); | ||
21 | extern unsigned int (*mach_get_ss)(void); | ||
22 | extern int (*mach_get_rtc_pll)(struct rtc_pll_info *); | ||
23 | extern int (*mach_set_rtc_pll)(struct rtc_pll_info *); | ||
24 | extern int (*mach_set_clock_mmss)(unsigned long); | ||
25 | extern void (*mach_reset)( void ); | ||
26 | extern void (*mach_halt)( void ); | ||
27 | extern void (*mach_power_off)( void ); | ||
28 | extern unsigned long (*mach_hd_init) (unsigned long, unsigned long); | ||
29 | extern void (*mach_hd_setup)(char *, int *); | ||
30 | extern long mach_max_dma_address; | ||
31 | extern void (*mach_heartbeat) (int); | ||
32 | extern void (*mach_l2_flush) (int); | ||
33 | extern void (*mach_beep) (unsigned int, unsigned int); | ||
34 | |||
35 | #endif /* _M68K_MACHDEP_H */ | ||
diff --git a/include/asm-m68k/machines.h b/include/asm-m68k/machines.h deleted file mode 100644 index be667e84f01b..000000000000 --- a/include/asm-m68k/machines.h +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | /* | ||
2 | * machines.h: Defines for taking apart the machine type value in the | ||
3 | * idprom and determining the kind of machine we are on. | ||
4 | * | ||
5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | ||
6 | * Sun3/3x models added by David Monro (davidm@psrg.cs.usyd.edu.au) | ||
7 | */ | ||
8 | #ifndef _SPARC_MACHINES_H | ||
9 | #define _SPARC_MACHINES_H | ||
10 | |||
11 | struct Sun_Machine_Models { | ||
12 | char *name; | ||
13 | unsigned char id_machtype; | ||
14 | }; | ||
15 | |||
16 | /* Current number of machines we know about that has an IDPROM | ||
17 | * machtype entry including one entry for the 0x80 OBP machines. | ||
18 | */ | ||
19 | // reduced along with table in arch/m68k/sun3/idprom.c | ||
20 | // sun3 port doesn't need to know about sparc machines. | ||
21 | //#define NUM_SUN_MACHINES 23 | ||
22 | #define NUM_SUN_MACHINES 8 | ||
23 | |||
24 | /* The machine type in the idprom area looks like this: | ||
25 | * | ||
26 | * --------------- | ||
27 | * | ARCH | MACH | | ||
28 | * --------------- | ||
29 | * 7 4 3 0 | ||
30 | * | ||
31 | * The ARCH field determines the architecture line (sun4, sun4c, etc). | ||
32 | * The MACH field determines the machine make within that architecture. | ||
33 | */ | ||
34 | |||
35 | #define SM_ARCH_MASK 0xf0 | ||
36 | #define SM_SUN3 0x10 | ||
37 | #define SM_SUN4 0x20 | ||
38 | #define SM_SUN3X 0x40 | ||
39 | #define SM_SUN4C 0x50 | ||
40 | #define SM_SUN4M 0x70 | ||
41 | #define SM_SUN4M_OBP 0x80 | ||
42 | |||
43 | #define SM_TYP_MASK 0x0f | ||
44 | /* Sun3 machines */ | ||
45 | #define SM_3_160 0x01 /* Sun 3/160 series */ | ||
46 | #define SM_3_50 0x02 /* Sun 3/50 series */ | ||
47 | #define SM_3_260 0x03 /* Sun 3/260 series */ | ||
48 | #define SM_3_110 0x04 /* Sun 3/110 series */ | ||
49 | #define SM_3_60 0x07 /* Sun 3/60 series */ | ||
50 | #define SM_3_E 0x08 /* Sun 3/E series */ | ||
51 | |||
52 | /* Sun3x machines */ | ||
53 | #define SM_3_460 0x01 /* Sun 3/460 (460,470,480) series */ | ||
54 | #define SM_3_80 0x02 /* Sun 3/80 series */ | ||
55 | |||
56 | /* Sun4 machines */ | ||
57 | #define SM_4_260 0x01 /* Sun 4/200 series */ | ||
58 | #define SM_4_110 0x02 /* Sun 4/100 series */ | ||
59 | #define SM_4_330 0x03 /* Sun 4/300 series */ | ||
60 | #define SM_4_470 0x04 /* Sun 4/400 series */ | ||
61 | |||
62 | /* Sun4c machines Full Name - PROM NAME */ | ||
63 | #define SM_4C_SS1 0x01 /* Sun4c SparcStation 1 - Sun 4/60 */ | ||
64 | #define SM_4C_IPC 0x02 /* Sun4c SparcStation IPC - Sun 4/40 */ | ||
65 | #define SM_4C_SS1PLUS 0x03 /* Sun4c SparcStation 1+ - Sun 4/65 */ | ||
66 | #define SM_4C_SLC 0x04 /* Sun4c SparcStation SLC - Sun 4/20 */ | ||
67 | #define SM_4C_SS2 0x05 /* Sun4c SparcStation 2 - Sun 4/75 */ | ||
68 | #define SM_4C_ELC 0x06 /* Sun4c SparcStation ELC - Sun 4/25 */ | ||
69 | #define SM_4C_IPX 0x07 /* Sun4c SparcStation IPX - Sun 4/50 */ | ||
70 | |||
71 | /* Sun4m machines, these predate the OpenBoot. These values only mean | ||
72 | * something if the value in the ARCH field is SM_SUN4M, if it is | ||
73 | * SM_SUN4M_OBP then you have the following situation: | ||
74 | * 1) You either have a sun4d, a sun4e, or a recently made sun4m. | ||
75 | * 2) You have to consult OpenBoot to determine which machine this is. | ||
76 | */ | ||
77 | #define SM_4M_SS60 0x01 /* Sun4m SparcSystem 600 */ | ||
78 | #define SM_4M_SS50 0x02 /* Sun4m SparcStation 10 */ | ||
79 | #define SM_4M_SS40 0x03 /* Sun4m SparcStation 5 */ | ||
80 | |||
81 | /* Sun4d machines -- N/A */ | ||
82 | /* Sun4e machines -- N/A */ | ||
83 | /* Sun4u machines -- N/A */ | ||
84 | |||
85 | #endif /* !(_SPARC_MACHINES_H) */ | ||
diff --git a/include/asm-m68k/machw.h b/include/asm-m68k/machw.h deleted file mode 100644 index 2b4de0c2ce4a..000000000000 --- a/include/asm-m68k/machw.h +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | /* | ||
2 | ** linux/machw.h -- This header defines some macros and pointers for | ||
3 | ** the various Macintosh custom hardware registers. | ||
4 | ** | ||
5 | ** Copyright 1997 by Michael Schmitz | ||
6 | ** | ||
7 | ** This file is subject to the terms and conditions of the GNU General Public | ||
8 | ** License. See the file COPYING in the main directory of this archive | ||
9 | ** for more details. | ||
10 | ** | ||
11 | */ | ||
12 | |||
13 | #ifndef _ASM_MACHW_H_ | ||
14 | #define _ASM_MACHW_H_ | ||
15 | |||
16 | /* | ||
17 | * head.S maps the videomem to VIDEOMEMBASE | ||
18 | */ | ||
19 | |||
20 | #define VIDEOMEMBASE 0xf0000000 | ||
21 | #define VIDEOMEMSIZE (4096*1024) | ||
22 | #define VIDEOMEMMASK (-4096*1024) | ||
23 | |||
24 | #ifndef __ASSEMBLY__ | ||
25 | |||
26 | #include <linux/types.h> | ||
27 | |||
28 | #if 0 | ||
29 | /* | ||
30 | ** SCC Z8530 | ||
31 | */ | ||
32 | |||
33 | #define MAC_SCC_BAS (0x50F04000) | ||
34 | struct MAC_SCC | ||
35 | { | ||
36 | u_char cha_a_ctrl; | ||
37 | u_char char_dummy1; | ||
38 | u_char cha_a_data; | ||
39 | u_char char_dummy2; | ||
40 | u_char cha_b_ctrl; | ||
41 | u_char char_dummy3; | ||
42 | u_char cha_b_data; | ||
43 | }; | ||
44 | # define mac_scc ((*(volatile struct SCC*)MAC_SCC_BAS)) | ||
45 | #endif | ||
46 | |||
47 | #endif /* __ASSEMBLY__ */ | ||
48 | |||
49 | #endif /* linux/machw.h */ | ||
diff --git a/include/asm-m68k/macintosh.h b/include/asm-m68k/macintosh.h deleted file mode 100644 index 05309f7e3d06..000000000000 --- a/include/asm-m68k/macintosh.h +++ /dev/null | |||
@@ -1,135 +0,0 @@ | |||
1 | #ifndef __ASM_MACINTOSH_H | ||
2 | #define __ASM_MACINTOSH_H | ||
3 | |||
4 | #include <linux/seq_file.h> | ||
5 | #include <linux/interrupt.h> | ||
6 | |||
7 | /* | ||
8 | * Apple Macintoshisms | ||
9 | */ | ||
10 | |||
11 | extern void mac_reset(void); | ||
12 | extern void mac_poweroff(void); | ||
13 | extern void mac_init_IRQ(void); | ||
14 | extern int mac_irq_pending(unsigned int); | ||
15 | |||
16 | /* | ||
17 | * Floppy driver magic hook - probably shouldnt be here | ||
18 | */ | ||
19 | |||
20 | extern void via1_set_head(int); | ||
21 | |||
22 | /* | ||
23 | * Macintosh Table | ||
24 | */ | ||
25 | |||
26 | struct mac_model | ||
27 | { | ||
28 | short ident; | ||
29 | char *name; | ||
30 | char adb_type; | ||
31 | char via_type; | ||
32 | char scsi_type; | ||
33 | char ide_type; | ||
34 | char scc_type; | ||
35 | char ether_type; | ||
36 | char nubus_type; | ||
37 | }; | ||
38 | |||
39 | #define MAC_ADB_NONE 0 | ||
40 | #define MAC_ADB_II 1 | ||
41 | #define MAC_ADB_IISI 2 | ||
42 | #define MAC_ADB_CUDA 3 | ||
43 | #define MAC_ADB_PB1 4 | ||
44 | #define MAC_ADB_PB2 5 | ||
45 | #define MAC_ADB_IOP 6 | ||
46 | |||
47 | #define MAC_VIA_II 1 | ||
48 | #define MAC_VIA_IIci 2 | ||
49 | #define MAC_VIA_QUADRA 3 | ||
50 | |||
51 | #define MAC_SCSI_NONE 0 | ||
52 | #define MAC_SCSI_OLD 1 | ||
53 | #define MAC_SCSI_QUADRA 2 | ||
54 | #define MAC_SCSI_QUADRA2 3 | ||
55 | #define MAC_SCSI_QUADRA3 4 | ||
56 | |||
57 | #define MAC_IDE_NONE 0 | ||
58 | #define MAC_IDE_QUADRA 1 | ||
59 | #define MAC_IDE_PB 2 | ||
60 | #define MAC_IDE_BABOON 3 | ||
61 | |||
62 | #define MAC_SCC_II 1 | ||
63 | #define MAC_SCC_IOP 2 | ||
64 | #define MAC_SCC_QUADRA 3 | ||
65 | #define MAC_SCC_PSC 4 | ||
66 | |||
67 | #define MAC_ETHER_NONE 0 | ||
68 | #define MAC_ETHER_SONIC 1 | ||
69 | #define MAC_ETHER_MACE 2 | ||
70 | |||
71 | #define MAC_NO_NUBUS 0 | ||
72 | #define MAC_NUBUS 1 | ||
73 | |||
74 | /* | ||
75 | * Gestalt numbers | ||
76 | */ | ||
77 | |||
78 | #define MAC_MODEL_II 6 | ||
79 | #define MAC_MODEL_IIX 7 | ||
80 | #define MAC_MODEL_IICX 8 | ||
81 | #define MAC_MODEL_SE30 9 | ||
82 | #define MAC_MODEL_IICI 11 | ||
83 | #define MAC_MODEL_IIFX 13 /* And well numbered it is too */ | ||
84 | #define MAC_MODEL_IISI 18 | ||
85 | #define MAC_MODEL_LC 19 | ||
86 | #define MAC_MODEL_Q900 20 | ||
87 | #define MAC_MODEL_PB170 21 | ||
88 | #define MAC_MODEL_Q700 22 | ||
89 | #define MAC_MODEL_CLII 23 /* aka: P200 */ | ||
90 | #define MAC_MODEL_PB140 25 | ||
91 | #define MAC_MODEL_Q950 26 /* aka: WGS95 */ | ||
92 | #define MAC_MODEL_LCIII 27 /* aka: P450 */ | ||
93 | #define MAC_MODEL_PB210 29 | ||
94 | #define MAC_MODEL_C650 30 | ||
95 | #define MAC_MODEL_PB230 32 | ||
96 | #define MAC_MODEL_PB180 33 | ||
97 | #define MAC_MODEL_PB160 34 | ||
98 | #define MAC_MODEL_Q800 35 /* aka: WGS80 */ | ||
99 | #define MAC_MODEL_Q650 36 | ||
100 | #define MAC_MODEL_LCII 37 /* aka: P400/405/410/430 */ | ||
101 | #define MAC_MODEL_PB250 38 | ||
102 | #define MAC_MODEL_IIVI 44 | ||
103 | #define MAC_MODEL_P600 45 /* aka: P600CD */ | ||
104 | #define MAC_MODEL_IIVX 48 | ||
105 | #define MAC_MODEL_CCL 49 /* aka: P250 */ | ||
106 | #define MAC_MODEL_PB165C 50 | ||
107 | #define MAC_MODEL_C610 52 /* aka: WGS60 */ | ||
108 | #define MAC_MODEL_Q610 53 | ||
109 | #define MAC_MODEL_PB145 54 /* aka: PB145B */ | ||
110 | #define MAC_MODEL_P520 56 /* aka: LC520 */ | ||
111 | #define MAC_MODEL_C660 60 | ||
112 | #define MAC_MODEL_P460 62 /* aka: LCIII+, P466/P467 */ | ||
113 | #define MAC_MODEL_PB180C 71 | ||
114 | #define MAC_MODEL_PB520 72 /* aka: PB520C, PB540, PB540C, PB550C */ | ||
115 | #define MAC_MODEL_PB270C 77 | ||
116 | #define MAC_MODEL_Q840 78 | ||
117 | #define MAC_MODEL_P550 80 /* aka: LC550, P560 */ | ||
118 | #define MAC_MODEL_CCLII 83 /* aka: P275 */ | ||
119 | #define MAC_MODEL_PB165 84 | ||
120 | #define MAC_MODEL_PB190 85 /* aka: PB190CS */ | ||
121 | #define MAC_MODEL_TV 88 | ||
122 | #define MAC_MODEL_P475 89 /* aka: LC475, P476 */ | ||
123 | #define MAC_MODEL_P475F 90 /* aka: P475 w/ FPU (no LC040) */ | ||
124 | #define MAC_MODEL_P575 92 /* aka: LC575, P577/P578 */ | ||
125 | #define MAC_MODEL_Q605 94 | ||
126 | #define MAC_MODEL_Q605_ACC 95 /* Q605 accelerated to 33 MHz */ | ||
127 | #define MAC_MODEL_Q630 98 /* aka: LC630, P630/631/635/636/637/638/640 */ | ||
128 | #define MAC_MODEL_P588 99 /* aka: LC580, P580 */ | ||
129 | #define MAC_MODEL_PB280 102 | ||
130 | #define MAC_MODEL_PB280C 103 | ||
131 | #define MAC_MODEL_PB150 115 | ||
132 | |||
133 | extern struct mac_model *macintosh_config; | ||
134 | |||
135 | #endif | ||
diff --git a/include/asm-m68k/macints.h b/include/asm-m68k/macints.h deleted file mode 100644 index 679c48ab4407..000000000000 --- a/include/asm-m68k/macints.h +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | /* | ||
2 | ** macints.h -- Macintosh Linux interrupt handling structs and prototypes | ||
3 | ** | ||
4 | ** Copyright 1997 by Michael Schmitz | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | */ | ||
11 | |||
12 | #ifndef _ASM_MACINTS_H_ | ||
13 | #define _ASM_MACINTS_H_ | ||
14 | |||
15 | #include <asm/irq.h> | ||
16 | |||
17 | /* Setting this prints debugging info for unclaimed interrupts */ | ||
18 | |||
19 | #define DEBUG_SPURIOUS | ||
20 | |||
21 | /* Setting this prints debugging info on each autovector interrupt */ | ||
22 | |||
23 | /* #define DEBUG_IRQS */ | ||
24 | |||
25 | /* Setting this prints debugging info on each Nubus interrupt */ | ||
26 | |||
27 | /* #define DEBUG_NUBUS_INT */ | ||
28 | |||
29 | /* Setting this prints debugging info on irqs as they enabled and disabled. */ | ||
30 | |||
31 | /* #define DEBUG_IRQUSE */ | ||
32 | |||
33 | /* | ||
34 | * Base IRQ number for all Mac68K interrupt sources. Each source | ||
35 | * has eight indexes (base -> base+7). | ||
36 | */ | ||
37 | |||
38 | #define VIA1_SOURCE_BASE 8 | ||
39 | #define VIA2_SOURCE_BASE 16 | ||
40 | #define MAC_SCC_SOURCE_BASE 24 | ||
41 | #define PSC3_SOURCE_BASE 24 | ||
42 | #define PSC4_SOURCE_BASE 32 | ||
43 | #define PSC5_SOURCE_BASE 40 | ||
44 | #define PSC6_SOURCE_BASE 48 | ||
45 | #define NUBUS_SOURCE_BASE 56 | ||
46 | #define BABOON_SOURCE_BASE 64 | ||
47 | |||
48 | /* | ||
49 | * Maximum IRQ number is BABOON_SOURCE_BASE + 7, | ||
50 | * giving us IRQs up through 71 | ||
51 | */ | ||
52 | |||
53 | #define NUM_MAC_SOURCES 72 | ||
54 | |||
55 | /* | ||
56 | * clean way to separate IRQ into its source and index | ||
57 | */ | ||
58 | |||
59 | #define IRQ_SRC(irq) (irq >> 3) | ||
60 | #define IRQ_IDX(irq) (irq & 7) | ||
61 | |||
62 | /* VIA1 interrupts */ | ||
63 | #define IRQ_VIA1_0 (8) /* one second int. */ | ||
64 | #define IRQ_VIA1_1 (9) /* VBlank int. */ | ||
65 | #define IRQ_MAC_VBL IRQ_VIA1_1 | ||
66 | #define IRQ_VIA1_2 (10) /* ADB SR shifts complete */ | ||
67 | #define IRQ_MAC_ADB IRQ_VIA1_2 | ||
68 | #define IRQ_MAC_ADB_SR IRQ_VIA1_2 | ||
69 | #define IRQ_VIA1_3 (11) /* ADB SR CB2 ?? */ | ||
70 | #define IRQ_MAC_ADB_SD IRQ_VIA1_3 | ||
71 | #define IRQ_VIA1_4 (12) /* ADB SR ext. clock pulse */ | ||
72 | #define IRQ_MAC_ADB_CL IRQ_VIA1_4 | ||
73 | #define IRQ_VIA1_5 (13) | ||
74 | #define IRQ_MAC_TIMER_2 IRQ_VIA1_5 | ||
75 | #define IRQ_VIA1_6 (14) | ||
76 | #define IRQ_MAC_TIMER_1 IRQ_VIA1_6 | ||
77 | #define IRQ_VIA1_7 (15) | ||
78 | |||
79 | /* VIA2/RBV interrupts */ | ||
80 | #define IRQ_VIA2_0 (16) | ||
81 | #define IRQ_MAC_SCSIDRQ IRQ_VIA2_0 | ||
82 | #define IRQ_VIA2_1 (17) | ||
83 | #define IRQ_MAC_NUBUS IRQ_VIA2_1 | ||
84 | #define IRQ_VIA2_2 (18) | ||
85 | #define IRQ_VIA2_3 (19) | ||
86 | #define IRQ_MAC_SCSI IRQ_VIA2_3 | ||
87 | #define IRQ_VIA2_4 (20) | ||
88 | #define IRQ_VIA2_5 (21) | ||
89 | #define IRQ_VIA2_6 (22) | ||
90 | #define IRQ_VIA2_7 (23) | ||
91 | |||
92 | /* Level 3 (PSC, AV Macs only) interrupts */ | ||
93 | #define IRQ_PSC3_0 (24) | ||
94 | #define IRQ_MAC_MACE IRQ_PSC3_0 | ||
95 | #define IRQ_PSC3_1 (25) | ||
96 | #define IRQ_PSC3_2 (26) | ||
97 | #define IRQ_PSC3_3 (27) | ||
98 | |||
99 | /* Level 4 (SCC) interrupts */ | ||
100 | #define IRQ_SCC (32) | ||
101 | #define IRQ_SCCA (33) | ||
102 | #define IRQ_SCCB (34) | ||
103 | #if 0 /* FIXME: are there multiple interrupt conditions on the SCC ?? */ | ||
104 | /* SCC interrupts */ | ||
105 | #define IRQ_SCCB_TX (32) | ||
106 | #define IRQ_SCCB_STAT (33) | ||
107 | #define IRQ_SCCB_RX (34) | ||
108 | #define IRQ_SCCB_SPCOND (35) | ||
109 | #define IRQ_SCCA_TX (36) | ||
110 | #define IRQ_SCCA_STAT (37) | ||
111 | #define IRQ_SCCA_RX (38) | ||
112 | #define IRQ_SCCA_SPCOND (39) | ||
113 | #endif | ||
114 | |||
115 | /* Level 4 (PSC, AV Macs only) interrupts */ | ||
116 | #define IRQ_PSC4_0 (32) | ||
117 | #define IRQ_PSC4_1 (33) | ||
118 | #define IRQ_PSC4_2 (34) | ||
119 | #define IRQ_PSC4_3 (35) | ||
120 | #define IRQ_MAC_MACE_DMA IRQ_PSC4_3 | ||
121 | |||
122 | /* Level 5 (PSC, AV Macs only) interrupts */ | ||
123 | #define IRQ_PSC5_0 (40) | ||
124 | #define IRQ_PSC5_1 (41) | ||
125 | #define IRQ_PSC5_2 (42) | ||
126 | #define IRQ_PSC5_3 (43) | ||
127 | |||
128 | /* Level 6 (PSC, AV Macs only) interrupts */ | ||
129 | #define IRQ_PSC6_0 (48) | ||
130 | #define IRQ_PSC6_1 (49) | ||
131 | #define IRQ_PSC6_2 (50) | ||
132 | #define IRQ_PSC6_3 (51) | ||
133 | |||
134 | /* Nubus interrupts (cascaded to VIA2) */ | ||
135 | #define IRQ_NUBUS_9 (56) | ||
136 | #define IRQ_NUBUS_A (57) | ||
137 | #define IRQ_NUBUS_B (58) | ||
138 | #define IRQ_NUBUS_C (59) | ||
139 | #define IRQ_NUBUS_D (60) | ||
140 | #define IRQ_NUBUS_E (61) | ||
141 | #define IRQ_NUBUS_F (62) | ||
142 | |||
143 | /* Baboon interrupts (cascaded to nubus slot $C) */ | ||
144 | #define IRQ_BABOON_0 (64) | ||
145 | #define IRQ_BABOON_1 (65) | ||
146 | #define IRQ_BABOON_2 (66) | ||
147 | #define IRQ_BABOON_3 (67) | ||
148 | |||
149 | #define SLOT2IRQ(x) (x + 47) | ||
150 | #define IRQ2SLOT(x) (x - 47) | ||
151 | |||
152 | #define INT_CLK 24576 /* CLK while int_clk =2.456MHz and divide = 100 */ | ||
153 | #define INT_TICKS 246 /* to make sched_time = 99.902... HZ */ | ||
154 | |||
155 | #endif /* asm/macints.h */ | ||
diff --git a/include/asm-m68k/math-emu.h b/include/asm-m68k/math-emu.h deleted file mode 100644 index ddfab96403cb..000000000000 --- a/include/asm-m68k/math-emu.h +++ /dev/null | |||
@@ -1,315 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_SETUP_H | ||
2 | #define _ASM_M68K_SETUP_H | ||
3 | |||
4 | #include <asm/setup.h> | ||
5 | #include <linux/linkage.h> | ||
6 | |||
7 | /* Status Register bits */ | ||
8 | |||
9 | /* accrued exception bits */ | ||
10 | #define FPSR_AEXC_INEX 3 | ||
11 | #define FPSR_AEXC_DZ 4 | ||
12 | #define FPSR_AEXC_UNFL 5 | ||
13 | #define FPSR_AEXC_OVFL 6 | ||
14 | #define FPSR_AEXC_IOP 7 | ||
15 | |||
16 | /* exception status bits */ | ||
17 | #define FPSR_EXC_INEX1 8 | ||
18 | #define FPSR_EXC_INEX2 9 | ||
19 | #define FPSR_EXC_DZ 10 | ||
20 | #define FPSR_EXC_UNFL 11 | ||
21 | #define FPSR_EXC_OVFL 12 | ||
22 | #define FPSR_EXC_OPERR 13 | ||
23 | #define FPSR_EXC_SNAN 14 | ||
24 | #define FPSR_EXC_BSUN 15 | ||
25 | |||
26 | /* quotient byte, assumes big-endian, of course */ | ||
27 | #define FPSR_QUOTIENT(fpsr) (*((signed char *) &(fpsr) + 1)) | ||
28 | |||
29 | /* condition code bits */ | ||
30 | #define FPSR_CC_NAN 24 | ||
31 | #define FPSR_CC_INF 25 | ||
32 | #define FPSR_CC_Z 26 | ||
33 | #define FPSR_CC_NEG 27 | ||
34 | |||
35 | |||
36 | /* Control register bits */ | ||
37 | |||
38 | /* rounding mode */ | ||
39 | #define FPCR_ROUND_RN 0 /* round to nearest/even */ | ||
40 | #define FPCR_ROUND_RZ 1 /* round to zero */ | ||
41 | #define FPCR_ROUND_RM 2 /* minus infinity */ | ||
42 | #define FPCR_ROUND_RP 3 /* plus infinity */ | ||
43 | |||
44 | /* rounding precision */ | ||
45 | #define FPCR_PRECISION_X 0 /* long double */ | ||
46 | #define FPCR_PRECISION_S 1 /* double */ | ||
47 | #define FPCR_PRECISION_D 2 /* float */ | ||
48 | |||
49 | |||
50 | /* Flags to select the debugging output */ | ||
51 | #define PDECODE 0 | ||
52 | #define PEXECUTE 1 | ||
53 | #define PCONV 2 | ||
54 | #define PNORM 3 | ||
55 | #define PREGISTER 4 | ||
56 | #define PINSTR 5 | ||
57 | #define PUNIMPL 6 | ||
58 | #define PMOVEM 7 | ||
59 | |||
60 | #define PMDECODE (1<<PDECODE) | ||
61 | #define PMEXECUTE (1<<PEXECUTE) | ||
62 | #define PMCONV (1<<PCONV) | ||
63 | #define PMNORM (1<<PNORM) | ||
64 | #define PMREGISTER (1<<PREGISTER) | ||
65 | #define PMINSTR (1<<PINSTR) | ||
66 | #define PMUNIMPL (1<<PUNIMPL) | ||
67 | #define PMMOVEM (1<<PMOVEM) | ||
68 | |||
69 | #ifndef __ASSEMBLY__ | ||
70 | |||
71 | #include <linux/kernel.h> | ||
72 | #include <linux/sched.h> | ||
73 | |||
74 | union fp_mant64 { | ||
75 | unsigned long long m64; | ||
76 | unsigned long m32[2]; | ||
77 | }; | ||
78 | |||
79 | union fp_mant128 { | ||
80 | unsigned long long m64[2]; | ||
81 | unsigned long m32[4]; | ||
82 | }; | ||
83 | |||
84 | /* internal representation of extended fp numbers */ | ||
85 | struct fp_ext { | ||
86 | unsigned char lowmant; | ||
87 | unsigned char sign; | ||
88 | unsigned short exp; | ||
89 | union fp_mant64 mant; | ||
90 | }; | ||
91 | |||
92 | /* C representation of FPU registers */ | ||
93 | /* NOTE: if you change this, you have to change the assembler offsets | ||
94 | below and the size in <asm/fpu.h>, too */ | ||
95 | struct fp_data { | ||
96 | struct fp_ext fpreg[8]; | ||
97 | unsigned int fpcr; | ||
98 | unsigned int fpsr; | ||
99 | unsigned int fpiar; | ||
100 | unsigned short prec; | ||
101 | unsigned short rnd; | ||
102 | struct fp_ext temp[2]; | ||
103 | }; | ||
104 | |||
105 | #ifdef FPU_EMU_DEBUG | ||
106 | extern unsigned int fp_debugprint; | ||
107 | |||
108 | #define dprint(bit, fmt, args...) ({ \ | ||
109 | if (fp_debugprint & (1 << (bit))) \ | ||
110 | printk(fmt, ## args); \ | ||
111 | }) | ||
112 | #else | ||
113 | #define dprint(bit, fmt, args...) | ||
114 | #endif | ||
115 | |||
116 | #define uprint(str) ({ \ | ||
117 | static int __count = 3; \ | ||
118 | \ | ||
119 | if (__count > 0) { \ | ||
120 | printk("You just hit an unimplemented " \ | ||
121 | "fpu instruction (%s)\n", str); \ | ||
122 | printk("Please report this to ....\n"); \ | ||
123 | __count--; \ | ||
124 | } \ | ||
125 | }) | ||
126 | |||
127 | #define FPDATA ((struct fp_data *)current->thread.fp) | ||
128 | |||
129 | #else /* __ASSEMBLY__ */ | ||
130 | |||
131 | #define FPDATA %a2 | ||
132 | |||
133 | /* offsets from the base register to the floating point data in the task struct */ | ||
134 | #define FPD_FPREG (TASK_THREAD+THREAD_FPREG+0) | ||
135 | #define FPD_FPCR (TASK_THREAD+THREAD_FPREG+96) | ||
136 | #define FPD_FPSR (TASK_THREAD+THREAD_FPREG+100) | ||
137 | #define FPD_FPIAR (TASK_THREAD+THREAD_FPREG+104) | ||
138 | #define FPD_PREC (TASK_THREAD+THREAD_FPREG+108) | ||
139 | #define FPD_RND (TASK_THREAD+THREAD_FPREG+110) | ||
140 | #define FPD_TEMPFP1 (TASK_THREAD+THREAD_FPREG+112) | ||
141 | #define FPD_TEMPFP2 (TASK_THREAD+THREAD_FPREG+124) | ||
142 | #define FPD_SIZEOF (TASK_THREAD+THREAD_FPREG+136) | ||
143 | |||
144 | /* offsets on the stack to access saved registers, | ||
145 | * these are only used during instruction decoding | ||
146 | * where we always know how deep we're on the stack. | ||
147 | */ | ||
148 | #define FPS_DO (PT_D0) | ||
149 | #define FPS_D1 (PT_D1) | ||
150 | #define FPS_D2 (PT_D2) | ||
151 | #define FPS_A0 (PT_A0) | ||
152 | #define FPS_A1 (PT_A1) | ||
153 | #define FPS_A2 (PT_A2) | ||
154 | #define FPS_SR (PT_SR) | ||
155 | #define FPS_PC (PT_PC) | ||
156 | #define FPS_EA (PT_PC+6) | ||
157 | #define FPS_PC2 (PT_PC+10) | ||
158 | |||
159 | .macro fp_get_fp_reg | ||
160 | lea (FPD_FPREG,FPDATA,%d0.w*4),%a0 | ||
161 | lea (%a0,%d0.w*8),%a0 | ||
162 | .endm | ||
163 | |||
164 | /* Macros used to get/put the current program counter. | ||
165 | * 020/030 use a different stack frame then 040/060, for the | ||
166 | * 040/060 the return pc points already to the next location, | ||
167 | * so this only needs to be modified for jump instructions. | ||
168 | */ | ||
169 | .macro fp_get_pc dest | ||
170 | move.l (FPS_PC+4,%sp),\dest | ||
171 | .endm | ||
172 | |||
173 | .macro fp_put_pc src,jump=0 | ||
174 | move.l \src,(FPS_PC+4,%sp) | ||
175 | .endm | ||
176 | |||
177 | .macro fp_get_instr_data f,s,dest,label | ||
178 | getuser \f,%sp@(FPS_PC+4)@(0),\dest,\label,%sp@(FPS_PC+4) | ||
179 | addq.l #\s,%sp@(FPS_PC+4) | ||
180 | .endm | ||
181 | |||
182 | .macro fp_get_instr_word dest,label,addr | ||
183 | fp_get_instr_data w,2,\dest,\label,\addr | ||
184 | .endm | ||
185 | |||
186 | .macro fp_get_instr_long dest,label,addr | ||
187 | fp_get_instr_data l,4,\dest,\label,\addr | ||
188 | .endm | ||
189 | |||
190 | /* These macros are used to read from/write to user space | ||
191 | * on error we jump to the fixup section, load the fault | ||
192 | * address into %a0 and jump to the exit. | ||
193 | * (derived from <asm/uaccess.h>) | ||
194 | */ | ||
195 | .macro getuser size,src,dest,label,addr | ||
196 | | printf ,"[\size<%08x]",1,\addr | ||
197 | .Lu1\@: moves\size \src,\dest | ||
198 | |||
199 | .section .fixup,"ax" | ||
200 | .even | ||
201 | .Lu2\@: move.l \addr,%a0 | ||
202 | jra \label | ||
203 | .previous | ||
204 | |||
205 | .section __ex_table,"a" | ||
206 | .align 4 | ||
207 | .long .Lu1\@,.Lu2\@ | ||
208 | .previous | ||
209 | .endm | ||
210 | |||
211 | .macro putuser size,src,dest,label,addr | ||
212 | | printf ,"[\size>%08x]",1,\addr | ||
213 | .Lu1\@: moves\size \src,\dest | ||
214 | .Lu2\@: | ||
215 | |||
216 | .section .fixup,"ax" | ||
217 | .even | ||
218 | .Lu3\@: move.l \addr,%a0 | ||
219 | jra \label | ||
220 | .previous | ||
221 | |||
222 | .section __ex_table,"a" | ||
223 | .align 4 | ||
224 | .long .Lu1\@,.Lu3\@ | ||
225 | .long .Lu2\@,.Lu3\@ | ||
226 | .previous | ||
227 | .endm | ||
228 | |||
229 | /* work around binutils idiocy */ | ||
230 | old_gas=-1 | ||
231 | .irp gas_ident.x .x | ||
232 | old_gas=old_gas+1 | ||
233 | .endr | ||
234 | .if !old_gas | ||
235 | .irp m b,w,l | ||
236 | .macro getuser.\m src,dest,label,addr | ||
237 | getuser .\m,\src,\dest,\label,\addr | ||
238 | .endm | ||
239 | .macro putuser.\m src,dest,label,addr | ||
240 | putuser .\m,\src,\dest,\label,\addr | ||
241 | .endm | ||
242 | .endr | ||
243 | .endif | ||
244 | |||
245 | .macro movestack nr,arg1,arg2,arg3,arg4,arg5 | ||
246 | .if \nr | ||
247 | movestack (\nr-1),\arg2,\arg3,\arg4,\arg5 | ||
248 | move.l \arg1,-(%sp) | ||
249 | .endif | ||
250 | .endm | ||
251 | |||
252 | .macro printf bit=-1,string,nr=0,arg1,arg2,arg3,arg4,arg5 | ||
253 | #ifdef FPU_EMU_DEBUG | ||
254 | .data | ||
255 | .Lpdata\@: | ||
256 | .string "\string" | ||
257 | .previous | ||
258 | |||
259 | movem.l %d0/%d1/%a0/%a1,-(%sp) | ||
260 | .if \bit+1 | ||
261 | #if 0 | ||
262 | moveq #\bit,%d0 | ||
263 | andw #7,%d0 | ||
264 | btst %d0,fp_debugprint+((31-\bit)/8) | ||
265 | #else | ||
266 | btst #\bit,fp_debugprint+((31-\bit)/8) | ||
267 | #endif | ||
268 | jeq .Lpskip\@ | ||
269 | .endif | ||
270 | movestack \nr,\arg1,\arg2,\arg3,\arg4,\arg5 | ||
271 | pea .Lpdata\@ | ||
272 | jsr printk | ||
273 | lea ((\nr+1)*4,%sp),%sp | ||
274 | .Lpskip\@: | ||
275 | movem.l (%sp)+,%d0/%d1/%a0/%a1 | ||
276 | #endif | ||
277 | .endm | ||
278 | |||
279 | .macro printx bit,fp | ||
280 | #ifdef FPU_EMU_DEBUG | ||
281 | movem.l %d0/%a0,-(%sp) | ||
282 | lea \fp,%a0 | ||
283 | #if 0 | ||
284 | moveq #'+',%d0 | ||
285 | tst.w (%a0) | ||
286 | jeq .Lx1\@ | ||
287 | moveq #'-',%d0 | ||
288 | .Lx1\@: printf \bit," %c",1,%d0 | ||
289 | move.l (4,%a0),%d0 | ||
290 | bclr #31,%d0 | ||
291 | jne .Lx2\@ | ||
292 | printf \bit,"0." | ||
293 | jra .Lx3\@ | ||
294 | .Lx2\@: printf \bit,"1." | ||
295 | .Lx3\@: printf \bit,"%08x%08x",2,%d0,%a0@(8) | ||
296 | move.w (2,%a0),%d0 | ||
297 | ext.l %d0 | ||
298 | printf \bit,"E%04x",1,%d0 | ||
299 | #else | ||
300 | printf \bit," %08x%08x%08x",3,%a0@,%a0@(4),%a0@(8) | ||
301 | #endif | ||
302 | movem.l (%sp)+,%d0/%a0 | ||
303 | #endif | ||
304 | .endm | ||
305 | |||
306 | .macro debug instr,args | ||
307 | #ifdef FPU_EMU_DEBUG | ||
308 | \instr \args | ||
309 | #endif | ||
310 | .endm | ||
311 | |||
312 | |||
313 | #endif /* __ASSEMBLY__ */ | ||
314 | |||
315 | #endif /* _ASM_M68K_SETUP_H */ | ||
diff --git a/include/asm-m68k/mc146818rtc.h b/include/asm-m68k/mc146818rtc.h deleted file mode 100644 index 9f70a01f73dc..000000000000 --- a/include/asm-m68k/mc146818rtc.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * Machine dependent access functions for RTC registers. | ||
3 | */ | ||
4 | #ifndef _ASM_MC146818RTC_H | ||
5 | #define _ASM_MC146818RTC_H | ||
6 | |||
7 | |||
8 | #ifdef CONFIG_ATARI | ||
9 | /* RTC in Atari machines */ | ||
10 | |||
11 | #include <asm/atarihw.h> | ||
12 | |||
13 | #define RTC_PORT(x) (TT_RTC_BAS + 2*(x)) | ||
14 | #define RTC_ALWAYS_BCD 0 | ||
15 | |||
16 | #define CMOS_READ(addr) ({ \ | ||
17 | atari_outb_p((addr),RTC_PORT(0)); \ | ||
18 | atari_inb_p(RTC_PORT(1)); \ | ||
19 | }) | ||
20 | #define CMOS_WRITE(val, addr) ({ \ | ||
21 | atari_outb_p((addr),RTC_PORT(0)); \ | ||
22 | atari_outb_p((val),RTC_PORT(1)); \ | ||
23 | }) | ||
24 | #endif /* CONFIG_ATARI */ | ||
25 | |||
26 | #endif /* _ASM_MC146818RTC_H */ | ||
diff --git a/include/asm-m68k/md.h b/include/asm-m68k/md.h deleted file mode 100644 index d2f78f226f3d..000000000000 --- a/include/asm-m68k/md.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | /* | ||
2 | * md.h: High speed xor_block operation for RAID4/5 | ||
3 | * | ||
4 | */ | ||
5 | |||
6 | #ifndef __ASM_MD_H | ||
7 | #define __ASM_MD_H | ||
8 | |||
9 | /* #define HAVE_ARCH_XORBLOCK */ | ||
10 | |||
11 | #define MD_XORBLOCK_ALIGNMENT sizeof(long) | ||
12 | |||
13 | #endif /* __ASM_MD_H */ | ||
diff --git a/include/asm-m68k/mman.h b/include/asm-m68k/mman.h deleted file mode 100644 index 1626d37f4898..000000000000 --- a/include/asm-m68k/mman.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef __M68K_MMAN_H__ | ||
2 | #define __M68K_MMAN_H__ | ||
3 | |||
4 | #include <asm-generic/mman.h> | ||
5 | |||
6 | #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ | ||
7 | #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ | ||
8 | #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ | ||
9 | #define MAP_LOCKED 0x2000 /* pages are locked */ | ||
10 | #define MAP_NORESERVE 0x4000 /* don't check for reservations */ | ||
11 | #define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ | ||
12 | #define MAP_NONBLOCK 0x10000 /* do not block on IO */ | ||
13 | |||
14 | #define MCL_CURRENT 1 /* lock all current mappings */ | ||
15 | #define MCL_FUTURE 2 /* lock all future mappings */ | ||
16 | |||
17 | #endif /* __M68K_MMAN_H__ */ | ||
diff --git a/include/asm-m68k/mmu.h b/include/asm-m68k/mmu.h deleted file mode 100644 index ccd36d26615a..000000000000 --- a/include/asm-m68k/mmu.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __MMU_H | ||
2 | #define __MMU_H | ||
3 | |||
4 | /* Default "unsigned long" context */ | ||
5 | typedef unsigned long mm_context_t; | ||
6 | |||
7 | #endif | ||
diff --git a/include/asm-m68k/mmu_context.h b/include/asm-m68k/mmu_context.h deleted file mode 100644 index 894dacbcee14..000000000000 --- a/include/asm-m68k/mmu_context.h +++ /dev/null | |||
@@ -1,154 +0,0 @@ | |||
1 | #ifndef __M68K_MMU_CONTEXT_H | ||
2 | #define __M68K_MMU_CONTEXT_H | ||
3 | |||
4 | #include <asm-generic/mm_hooks.h> | ||
5 | |||
6 | static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) | ||
7 | { | ||
8 | } | ||
9 | |||
10 | #ifndef CONFIG_SUN3 | ||
11 | |||
12 | #include <asm/setup.h> | ||
13 | #include <asm/page.h> | ||
14 | #include <asm/pgalloc.h> | ||
15 | |||
16 | static inline int init_new_context(struct task_struct *tsk, | ||
17 | struct mm_struct *mm) | ||
18 | { | ||
19 | mm->context = virt_to_phys(mm->pgd); | ||
20 | return 0; | ||
21 | } | ||
22 | |||
23 | #define destroy_context(mm) do { } while(0) | ||
24 | |||
25 | static inline void switch_mm_0230(struct mm_struct *mm) | ||
26 | { | ||
27 | unsigned long crp[2] = { | ||
28 | 0x80000000 | _PAGE_TABLE, mm->context | ||
29 | }; | ||
30 | unsigned long tmp; | ||
31 | |||
32 | asm volatile (".chip 68030"); | ||
33 | |||
34 | /* flush MC68030/MC68020 caches (they are virtually addressed) */ | ||
35 | asm volatile ( | ||
36 | "movec %%cacr,%0;" | ||
37 | "orw %1,%0; " | ||
38 | "movec %0,%%cacr" | ||
39 | : "=d" (tmp) : "di" (FLUSH_I_AND_D)); | ||
40 | |||
41 | /* Switch the root pointer. For a 030-only kernel, | ||
42 | * avoid flushing the whole ATC, we only need to | ||
43 | * flush the user entries. The 68851 does this by | ||
44 | * itself. Avoid a runtime check here. | ||
45 | */ | ||
46 | asm volatile ( | ||
47 | #ifdef CPU_M68030_ONLY | ||
48 | "pmovefd %0,%%crp; " | ||
49 | "pflush #0,#4" | ||
50 | #else | ||
51 | "pmove %0,%%crp" | ||
52 | #endif | ||
53 | : : "m" (crp[0])); | ||
54 | |||
55 | asm volatile (".chip 68k"); | ||
56 | } | ||
57 | |||
58 | static inline void switch_mm_0460(struct mm_struct *mm) | ||
59 | { | ||
60 | asm volatile (".chip 68040"); | ||
61 | |||
62 | /* flush address translation cache (user entries) */ | ||
63 | asm volatile ("pflushan"); | ||
64 | |||
65 | /* switch the root pointer */ | ||
66 | asm volatile ("movec %0,%%urp" : : "r" (mm->context)); | ||
67 | |||
68 | if (CPU_IS_060) { | ||
69 | unsigned long tmp; | ||
70 | |||
71 | /* clear user entries in the branch cache */ | ||
72 | asm volatile ( | ||
73 | "movec %%cacr,%0; " | ||
74 | "orl %1,%0; " | ||
75 | "movec %0,%%cacr" | ||
76 | : "=d" (tmp): "di" (0x00200000)); | ||
77 | } | ||
78 | |||
79 | asm volatile (".chip 68k"); | ||
80 | } | ||
81 | |||
82 | static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) | ||
83 | { | ||
84 | if (prev != next) { | ||
85 | if (CPU_IS_020_OR_030) | ||
86 | switch_mm_0230(next); | ||
87 | else | ||
88 | switch_mm_0460(next); | ||
89 | } | ||
90 | } | ||
91 | |||
92 | #define deactivate_mm(tsk,mm) do { } while (0) | ||
93 | |||
94 | static inline void activate_mm(struct mm_struct *prev_mm, | ||
95 | struct mm_struct *next_mm) | ||
96 | { | ||
97 | next_mm->context = virt_to_phys(next_mm->pgd); | ||
98 | |||
99 | if (CPU_IS_020_OR_030) | ||
100 | switch_mm_0230(next_mm); | ||
101 | else | ||
102 | switch_mm_0460(next_mm); | ||
103 | } | ||
104 | |||
105 | #else /* CONFIG_SUN3 */ | ||
106 | #include <asm/sun3mmu.h> | ||
107 | #include <linux/sched.h> | ||
108 | |||
109 | extern unsigned long get_free_context(struct mm_struct *mm); | ||
110 | extern void clear_context(unsigned long context); | ||
111 | |||
112 | /* set the context for a new task to unmapped */ | ||
113 | static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) | ||
114 | { | ||
115 | mm->context = SUN3_INVALID_CONTEXT; | ||
116 | return 0; | ||
117 | } | ||
118 | |||
119 | /* find the context given to this process, and if it hasn't already | ||
120 | got one, go get one for it. */ | ||
121 | static inline void get_mmu_context(struct mm_struct *mm) | ||
122 | { | ||
123 | if(mm->context == SUN3_INVALID_CONTEXT) | ||
124 | mm->context = get_free_context(mm); | ||
125 | } | ||
126 | |||
127 | /* flush context if allocated... */ | ||
128 | static inline void destroy_context(struct mm_struct *mm) | ||
129 | { | ||
130 | if(mm->context != SUN3_INVALID_CONTEXT) | ||
131 | clear_context(mm->context); | ||
132 | } | ||
133 | |||
134 | static inline void activate_context(struct mm_struct *mm) | ||
135 | { | ||
136 | get_mmu_context(mm); | ||
137 | sun3_put_context(mm->context); | ||
138 | } | ||
139 | |||
140 | static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) | ||
141 | { | ||
142 | activate_context(tsk->mm); | ||
143 | } | ||
144 | |||
145 | #define deactivate_mm(tsk,mm) do { } while (0) | ||
146 | |||
147 | static inline void activate_mm(struct mm_struct *prev_mm, | ||
148 | struct mm_struct *next_mm) | ||
149 | { | ||
150 | activate_context(next_mm); | ||
151 | } | ||
152 | |||
153 | #endif | ||
154 | #endif | ||
diff --git a/include/asm-m68k/mmzone.h b/include/asm-m68k/mmzone.h deleted file mode 100644 index e1f1ec7b7006..000000000000 --- a/include/asm-m68k/mmzone.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_MMZONE_H_ | ||
2 | #define _ASM_M68K_MMZONE_H_ | ||
3 | |||
4 | extern pg_data_t pg_data_map[]; | ||
5 | |||
6 | #define NODE_DATA(nid) (&pg_data_map[nid]) | ||
7 | #define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) | ||
8 | |||
9 | #endif /* _ASM_M68K_MMZONE_H_ */ | ||
diff --git a/include/asm-m68k/module.h b/include/asm-m68k/module.h deleted file mode 100644 index 382d20a6fc18..000000000000 --- a/include/asm-m68k/module.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_MODULE_H | ||
2 | #define _ASM_M68K_MODULE_H | ||
3 | |||
4 | struct mod_arch_specific { | ||
5 | struct m68k_fixup_info *fixup_start, *fixup_end; | ||
6 | }; | ||
7 | |||
8 | #define MODULE_ARCH_INIT { \ | ||
9 | .fixup_start = __start_fixup, \ | ||
10 | .fixup_end = __stop_fixup, \ | ||
11 | } | ||
12 | |||
13 | #define Elf_Shdr Elf32_Shdr | ||
14 | #define Elf_Sym Elf32_Sym | ||
15 | #define Elf_Ehdr Elf32_Ehdr | ||
16 | |||
17 | |||
18 | enum m68k_fixup_type { | ||
19 | m68k_fixup_memoffset, | ||
20 | m68k_fixup_vnode_shift, | ||
21 | }; | ||
22 | |||
23 | struct m68k_fixup_info { | ||
24 | enum m68k_fixup_type type; | ||
25 | void *addr; | ||
26 | }; | ||
27 | |||
28 | #define m68k_fixup(type, addr) \ | ||
29 | " .section \".m68k_fixup\",\"aw\"\n" \ | ||
30 | " .long " #type "," #addr "\n" \ | ||
31 | " .previous\n" | ||
32 | |||
33 | extern struct m68k_fixup_info __start_fixup[], __stop_fixup[]; | ||
34 | |||
35 | struct module; | ||
36 | extern void module_fixup(struct module *mod, struct m68k_fixup_info *start, | ||
37 | struct m68k_fixup_info *end); | ||
38 | |||
39 | #endif /* _ASM_M68K_MODULE_H */ | ||
diff --git a/include/asm-m68k/motorola_pgalloc.h b/include/asm-m68k/motorola_pgalloc.h deleted file mode 100644 index d08bf6261df8..000000000000 --- a/include/asm-m68k/motorola_pgalloc.h +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | #ifndef _MOTOROLA_PGALLOC_H | ||
2 | #define _MOTOROLA_PGALLOC_H | ||
3 | |||
4 | #include <asm/tlb.h> | ||
5 | #include <asm/tlbflush.h> | ||
6 | |||
7 | extern pmd_t *get_pointer_table(void); | ||
8 | extern int free_pointer_table(pmd_t *); | ||
9 | |||
10 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) | ||
11 | { | ||
12 | pte_t *pte; | ||
13 | |||
14 | pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); | ||
15 | if (pte) { | ||
16 | __flush_page_to_ram(pte); | ||
17 | flush_tlb_kernel_page(pte); | ||
18 | nocache_page(pte); | ||
19 | } | ||
20 | |||
21 | return pte; | ||
22 | } | ||
23 | |||
24 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) | ||
25 | { | ||
26 | cache_page(pte); | ||
27 | free_page((unsigned long) pte); | ||
28 | } | ||
29 | |||
30 | static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) | ||
31 | { | ||
32 | struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); | ||
33 | pte_t *pte; | ||
34 | |||
35 | if(!page) | ||
36 | return NULL; | ||
37 | |||
38 | pte = kmap(page); | ||
39 | if (pte) { | ||
40 | __flush_page_to_ram(pte); | ||
41 | flush_tlb_kernel_page(pte); | ||
42 | nocache_page(pte); | ||
43 | } | ||
44 | kunmap(pte); | ||
45 | pgtable_page_ctor(page); | ||
46 | return page; | ||
47 | } | ||
48 | |||
49 | static inline void pte_free(struct mm_struct *mm, pgtable_t page) | ||
50 | { | ||
51 | pgtable_page_dtor(page); | ||
52 | cache_page(kmap(page)); | ||
53 | kunmap(page); | ||
54 | __free_page(page); | ||
55 | } | ||
56 | |||
57 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page) | ||
58 | { | ||
59 | pgtable_page_dtor(page); | ||
60 | cache_page(kmap(page)); | ||
61 | kunmap(page); | ||
62 | __free_page(page); | ||
63 | } | ||
64 | |||
65 | |||
66 | static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | ||
67 | { | ||
68 | return get_pointer_table(); | ||
69 | } | ||
70 | |||
71 | static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd) | ||
72 | { | ||
73 | return free_pointer_table(pmd); | ||
74 | } | ||
75 | |||
76 | static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | ||
77 | { | ||
78 | return free_pointer_table(pmd); | ||
79 | } | ||
80 | |||
81 | |||
82 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) | ||
83 | { | ||
84 | pmd_free(mm, (pmd_t *)pgd); | ||
85 | } | ||
86 | |||
87 | static inline pgd_t *pgd_alloc(struct mm_struct *mm) | ||
88 | { | ||
89 | return (pgd_t *)get_pointer_table(); | ||
90 | } | ||
91 | |||
92 | |||
93 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) | ||
94 | { | ||
95 | pmd_set(pmd, pte); | ||
96 | } | ||
97 | |||
98 | static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) | ||
99 | { | ||
100 | pmd_set(pmd, page_address(page)); | ||
101 | } | ||
102 | #define pmd_pgtable(pmd) pmd_page(pmd) | ||
103 | |||
104 | static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd) | ||
105 | { | ||
106 | pgd_set(pgd, pmd); | ||
107 | } | ||
108 | |||
109 | #endif /* _MOTOROLA_PGALLOC_H */ | ||
diff --git a/include/asm-m68k/motorola_pgtable.h b/include/asm-m68k/motorola_pgtable.h deleted file mode 100644 index 8e9a8a754dde..000000000000 --- a/include/asm-m68k/motorola_pgtable.h +++ /dev/null | |||
@@ -1,291 +0,0 @@ | |||
1 | #ifndef _MOTOROLA_PGTABLE_H | ||
2 | #define _MOTOROLA_PGTABLE_H | ||
3 | |||
4 | |||
5 | /* | ||
6 | * Definitions for MMU descriptors | ||
7 | */ | ||
8 | #define _PAGE_PRESENT 0x001 | ||
9 | #define _PAGE_SHORT 0x002 | ||
10 | #define _PAGE_RONLY 0x004 | ||
11 | #define _PAGE_ACCESSED 0x008 | ||
12 | #define _PAGE_DIRTY 0x010 | ||
13 | #define _PAGE_SUPER 0x080 /* 68040 supervisor only */ | ||
14 | #define _PAGE_GLOBAL040 0x400 /* 68040 global bit, used for kva descs */ | ||
15 | #define _PAGE_NOCACHE030 0x040 /* 68030 no-cache mode */ | ||
16 | #define _PAGE_NOCACHE 0x060 /* 68040 cache mode, non-serialized */ | ||
17 | #define _PAGE_NOCACHE_S 0x040 /* 68040 no-cache mode, serialized */ | ||
18 | #define _PAGE_CACHE040 0x020 /* 68040 cache mode, cachable, copyback */ | ||
19 | #define _PAGE_CACHE040W 0x000 /* 68040 cache mode, cachable, write-through */ | ||
20 | |||
21 | #define _DESCTYPE_MASK 0x003 | ||
22 | |||
23 | #define _CACHEMASK040 (~0x060) | ||
24 | #define _TABLE_MASK (0xfffffe00) | ||
25 | |||
26 | #define _PAGE_TABLE (_PAGE_SHORT) | ||
27 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_NOCACHE) | ||
28 | |||
29 | #define _PAGE_PROTNONE 0x004 | ||
30 | #define _PAGE_FILE 0x008 /* pagecache or swap? */ | ||
31 | |||
32 | #ifndef __ASSEMBLY__ | ||
33 | |||
34 | /* This is the cache mode to be used for pages containing page descriptors for | ||
35 | * processors >= '040. It is in pte_mknocache(), and the variable is defined | ||
36 | * and initialized in head.S */ | ||
37 | extern int m68k_pgtable_cachemode; | ||
38 | |||
39 | /* This is the cache mode for normal pages, for supervisor access on | ||
40 | * processors >= '040. It is used in pte_mkcache(), and the variable is | ||
41 | * defined and initialized in head.S */ | ||
42 | |||
43 | #if defined(CPU_M68060_ONLY) && defined(CONFIG_060_WRITETHROUGH) | ||
44 | #define m68k_supervisor_cachemode _PAGE_CACHE040W | ||
45 | #elif defined(CPU_M68040_OR_M68060_ONLY) | ||
46 | #define m68k_supervisor_cachemode _PAGE_CACHE040 | ||
47 | #elif defined(CPU_M68020_OR_M68030_ONLY) | ||
48 | #define m68k_supervisor_cachemode 0 | ||
49 | #else | ||
50 | extern int m68k_supervisor_cachemode; | ||
51 | #endif | ||
52 | |||
53 | #if defined(CPU_M68040_OR_M68060_ONLY) | ||
54 | #define mm_cachebits _PAGE_CACHE040 | ||
55 | #elif defined(CPU_M68020_OR_M68030_ONLY) | ||
56 | #define mm_cachebits 0 | ||
57 | #else | ||
58 | extern unsigned long mm_cachebits; | ||
59 | #endif | ||
60 | |||
61 | #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED | mm_cachebits) | ||
62 | #define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | mm_cachebits) | ||
63 | #define PAGE_COPY __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED | mm_cachebits) | ||
64 | #define PAGE_READONLY __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED | mm_cachebits) | ||
65 | #define PAGE_KERNEL __pgprot(_PAGE_PRESENT | _PAGE_DIRTY | _PAGE_ACCESSED | mm_cachebits) | ||
66 | |||
67 | /* Alternate definitions that are compile time constants, for | ||
68 | initializing protection_map. The cachebits are fixed later. */ | ||
69 | #define PAGE_NONE_C __pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED) | ||
70 | #define PAGE_SHARED_C __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED) | ||
71 | #define PAGE_COPY_C __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED) | ||
72 | #define PAGE_READONLY_C __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED) | ||
73 | |||
74 | /* | ||
75 | * The m68k can't do page protection for execute, and considers that the same are read. | ||
76 | * Also, write permissions imply read permissions. This is the closest we can get.. | ||
77 | */ | ||
78 | #define __P000 PAGE_NONE_C | ||
79 | #define __P001 PAGE_READONLY_C | ||
80 | #define __P010 PAGE_COPY_C | ||
81 | #define __P011 PAGE_COPY_C | ||
82 | #define __P100 PAGE_READONLY_C | ||
83 | #define __P101 PAGE_READONLY_C | ||
84 | #define __P110 PAGE_COPY_C | ||
85 | #define __P111 PAGE_COPY_C | ||
86 | |||
87 | #define __S000 PAGE_NONE_C | ||
88 | #define __S001 PAGE_READONLY_C | ||
89 | #define __S010 PAGE_SHARED_C | ||
90 | #define __S011 PAGE_SHARED_C | ||
91 | #define __S100 PAGE_READONLY_C | ||
92 | #define __S101 PAGE_READONLY_C | ||
93 | #define __S110 PAGE_SHARED_C | ||
94 | #define __S111 PAGE_SHARED_C | ||
95 | |||
96 | /* | ||
97 | * Conversion functions: convert a page and protection to a page entry, | ||
98 | * and a page entry and page directory to the page they refer to. | ||
99 | */ | ||
100 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
101 | |||
102 | static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | ||
103 | { | ||
104 | pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); | ||
105 | return pte; | ||
106 | } | ||
107 | |||
108 | static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) | ||
109 | { | ||
110 | unsigned long ptbl = virt_to_phys(ptep) | _PAGE_TABLE | _PAGE_ACCESSED; | ||
111 | unsigned long *ptr = pmdp->pmd; | ||
112 | short i = 16; | ||
113 | while (--i >= 0) { | ||
114 | *ptr++ = ptbl; | ||
115 | ptbl += (sizeof(pte_t)*PTRS_PER_PTE/16); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) | ||
120 | { | ||
121 | pgd_val(*pgdp) = _PAGE_TABLE | _PAGE_ACCESSED | __pa(pmdp); | ||
122 | } | ||
123 | |||
124 | #define __pte_page(pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK)) | ||
125 | #define __pmd_page(pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK)) | ||
126 | #define __pgd_page(pgd) ((unsigned long)__va(pgd_val(pgd) & _TABLE_MASK)) | ||
127 | |||
128 | |||
129 | #define pte_none(pte) (!pte_val(pte)) | ||
130 | #define pte_present(pte) (pte_val(pte) & (_PAGE_PRESENT | _PAGE_PROTNONE)) | ||
131 | #define pte_clear(mm,addr,ptep) ({ pte_val(*(ptep)) = 0; }) | ||
132 | |||
133 | #define pte_page(pte) virt_to_page(__va(pte_val(pte))) | ||
134 | #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) | ||
135 | #define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) | ||
136 | |||
137 | #define pmd_none(pmd) (!pmd_val(pmd)) | ||
138 | #define pmd_bad(pmd) ((pmd_val(pmd) & _DESCTYPE_MASK) != _PAGE_TABLE) | ||
139 | #define pmd_present(pmd) (pmd_val(pmd) & _PAGE_TABLE) | ||
140 | #define pmd_clear(pmdp) ({ \ | ||
141 | unsigned long *__ptr = pmdp->pmd; \ | ||
142 | short __i = 16; \ | ||
143 | while (--__i >= 0) \ | ||
144 | *__ptr++ = 0; \ | ||
145 | }) | ||
146 | #define pmd_page(pmd) virt_to_page(__va(pmd_val(pmd))) | ||
147 | |||
148 | |||
149 | #define pgd_none(pgd) (!pgd_val(pgd)) | ||
150 | #define pgd_bad(pgd) ((pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE) | ||
151 | #define pgd_present(pgd) (pgd_val(pgd) & _PAGE_TABLE) | ||
152 | #define pgd_clear(pgdp) ({ pgd_val(*pgdp) = 0; }) | ||
153 | #define pgd_page(pgd) (mem_map + ((unsigned long)(__va(pgd_val(pgd)) - PAGE_OFFSET) >> PAGE_SHIFT)) | ||
154 | |||
155 | #define pte_ERROR(e) \ | ||
156 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) | ||
157 | #define pmd_ERROR(e) \ | ||
158 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e)) | ||
159 | #define pgd_ERROR(e) \ | ||
160 | printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) | ||
161 | |||
162 | |||
163 | /* | ||
164 | * The following only work if pte_present() is true. | ||
165 | * Undefined behaviour if not.. | ||
166 | */ | ||
167 | static inline int pte_write(pte_t pte) { return !(pte_val(pte) & _PAGE_RONLY); } | ||
168 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } | ||
169 | static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } | ||
170 | static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } | ||
171 | static inline int pte_special(pte_t pte) { return 0; } | ||
172 | |||
173 | static inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) |= _PAGE_RONLY; return pte; } | ||
174 | static inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~_PAGE_DIRTY; return pte; } | ||
175 | static inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } | ||
176 | static inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) &= ~_PAGE_RONLY; return pte; } | ||
177 | static inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= _PAGE_DIRTY; return pte; } | ||
178 | static inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= _PAGE_ACCESSED; return pte; } | ||
179 | static inline pte_t pte_mknocache(pte_t pte) | ||
180 | { | ||
181 | pte_val(pte) = (pte_val(pte) & _CACHEMASK040) | m68k_pgtable_cachemode; | ||
182 | return pte; | ||
183 | } | ||
184 | static inline pte_t pte_mkcache(pte_t pte) | ||
185 | { | ||
186 | pte_val(pte) = (pte_val(pte) & _CACHEMASK040) | m68k_supervisor_cachemode; | ||
187 | return pte; | ||
188 | } | ||
189 | static inline pte_t pte_mkspecial(pte_t pte) { return pte; } | ||
190 | |||
191 | #define PAGE_DIR_OFFSET(tsk,address) pgd_offset((tsk),(address)) | ||
192 | |||
193 | #define pgd_index(address) ((address) >> PGDIR_SHIFT) | ||
194 | |||
195 | /* to find an entry in a page-table-directory */ | ||
196 | static inline pgd_t *pgd_offset(const struct mm_struct *mm, | ||
197 | unsigned long address) | ||
198 | { | ||
199 | return mm->pgd + pgd_index(address); | ||
200 | } | ||
201 | |||
202 | #define swapper_pg_dir kernel_pg_dir | ||
203 | extern pgd_t kernel_pg_dir[128]; | ||
204 | |||
205 | static inline pgd_t *pgd_offset_k(unsigned long address) | ||
206 | { | ||
207 | return kernel_pg_dir + (address >> PGDIR_SHIFT); | ||
208 | } | ||
209 | |||
210 | |||
211 | /* Find an entry in the second-level page table.. */ | ||
212 | static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address) | ||
213 | { | ||
214 | return (pmd_t *)__pgd_page(*dir) + ((address >> PMD_SHIFT) & (PTRS_PER_PMD-1)); | ||
215 | } | ||
216 | |||
217 | /* Find an entry in the third-level page table.. */ | ||
218 | static inline pte_t *pte_offset_kernel(pmd_t *pmdp, unsigned long address) | ||
219 | { | ||
220 | return (pte_t *)__pmd_page(*pmdp) + ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)); | ||
221 | } | ||
222 | |||
223 | #define pte_offset_map(pmdp,address) ((pte_t *)__pmd_page(*pmdp) + (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) | ||
224 | #define pte_offset_map_nested(pmdp, address) pte_offset_map(pmdp, address) | ||
225 | #define pte_unmap(pte) ((void)0) | ||
226 | #define pte_unmap_nested(pte) ((void)0) | ||
227 | |||
228 | /* | ||
229 | * Allocate and free page tables. The xxx_kernel() versions are | ||
230 | * used to allocate a kernel page table - this turns on ASN bits | ||
231 | * if any. | ||
232 | */ | ||
233 | |||
234 | /* Prior to calling these routines, the page should have been flushed | ||
235 | * from both the cache and ATC, or the CPU might not notice that the | ||
236 | * cache setting for the page has been changed. -jskov | ||
237 | */ | ||
238 | static inline void nocache_page(void *vaddr) | ||
239 | { | ||
240 | unsigned long addr = (unsigned long)vaddr; | ||
241 | |||
242 | if (CPU_IS_040_OR_060) { | ||
243 | pgd_t *dir; | ||
244 | pmd_t *pmdp; | ||
245 | pte_t *ptep; | ||
246 | |||
247 | dir = pgd_offset_k(addr); | ||
248 | pmdp = pmd_offset(dir, addr); | ||
249 | ptep = pte_offset_kernel(pmdp, addr); | ||
250 | *ptep = pte_mknocache(*ptep); | ||
251 | } | ||
252 | } | ||
253 | |||
254 | static inline void cache_page(void *vaddr) | ||
255 | { | ||
256 | unsigned long addr = (unsigned long)vaddr; | ||
257 | |||
258 | if (CPU_IS_040_OR_060) { | ||
259 | pgd_t *dir; | ||
260 | pmd_t *pmdp; | ||
261 | pte_t *ptep; | ||
262 | |||
263 | dir = pgd_offset_k(addr); | ||
264 | pmdp = pmd_offset(dir, addr); | ||
265 | ptep = pte_offset_kernel(pmdp, addr); | ||
266 | *ptep = pte_mkcache(*ptep); | ||
267 | } | ||
268 | } | ||
269 | |||
270 | #define PTE_FILE_MAX_BITS 28 | ||
271 | |||
272 | static inline unsigned long pte_to_pgoff(pte_t pte) | ||
273 | { | ||
274 | return pte.pte >> 4; | ||
275 | } | ||
276 | |||
277 | static inline pte_t pgoff_to_pte(unsigned off) | ||
278 | { | ||
279 | pte_t pte = { (off << 4) + _PAGE_FILE }; | ||
280 | return pte; | ||
281 | } | ||
282 | |||
283 | /* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */ | ||
284 | #define __swp_type(x) (((x).val >> 4) & 0xff) | ||
285 | #define __swp_offset(x) ((x).val >> 12) | ||
286 | #define __swp_entry(type, offset) ((swp_entry_t) { ((type) << 4) | ((offset) << 12) }) | ||
287 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) | ||
288 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) | ||
289 | |||
290 | #endif /* !__ASSEMBLY__ */ | ||
291 | #endif /* _MOTOROLA_PGTABLE_H */ | ||
diff --git a/include/asm-m68k/movs.h b/include/asm-m68k/movs.h deleted file mode 100644 index 67dbea36960f..000000000000 --- a/include/asm-m68k/movs.h +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | #ifndef __MOVS_H__ | ||
2 | #define __MOVS_H__ | ||
3 | |||
4 | /* | ||
5 | ** movs.h | ||
6 | ** | ||
7 | ** Inline assembly macros to generate movs & related instructions | ||
8 | */ | ||
9 | |||
10 | /* Set DFC register value */ | ||
11 | |||
12 | #define SET_DFC(x) \ | ||
13 | __asm__ __volatile__ (" movec %0,%/dfc" : : "d" (x)); | ||
14 | |||
15 | /* Get DFC register value */ | ||
16 | |||
17 | #define GET_DFC(x) \ | ||
18 | __asm__ __volatile__ (" movec %/dfc, %0" : "=d" (x) : ); | ||
19 | |||
20 | /* Set SFC register value */ | ||
21 | |||
22 | #define SET_SFC(x) \ | ||
23 | __asm__ __volatile__ (" movec %0,%/sfc" : : "d" (x)); | ||
24 | |||
25 | /* Get SFC register value */ | ||
26 | |||
27 | #define GET_SFC(x) \ | ||
28 | __asm__ __volatile__ (" movec %/sfc, %0" : "=d" (x) : ); | ||
29 | |||
30 | #define SET_VBR(x) \ | ||
31 | __asm__ __volatile__ (" movec %0,%/vbr" : : "r" (x)); | ||
32 | |||
33 | #define GET_VBR(x) \ | ||
34 | __asm__ __volatile__ (" movec %/vbr, %0" : "=g" (x) : ); | ||
35 | |||
36 | /* Set a byte using the "movs" instruction */ | ||
37 | |||
38 | #define SET_CONTROL_BYTE(addr,value) \ | ||
39 | __asm__ __volatile__ (" movsb %0, %1@" : : "d" (value), "a" (addr)); | ||
40 | |||
41 | /* Get a byte using the "movs" instruction */ | ||
42 | |||
43 | #define GET_CONTROL_BYTE(addr,value) \ | ||
44 | __asm__ __volatile__ (" movsb %1@, %0" : "=d" (value) : "a" (addr)); | ||
45 | |||
46 | /* Set a (long)word using the "movs" instruction */ | ||
47 | |||
48 | #define SET_CONTROL_WORD(addr,value) \ | ||
49 | __asm__ __volatile__ (" movsl %0, %1@" : : "d" (value), "a" (addr)); | ||
50 | |||
51 | /* Get a (long)word using the "movs" instruction */ | ||
52 | |||
53 | #define GET_CONTROL_WORD(addr,value) \ | ||
54 | __asm__ __volatile__ (" movsl %1@, %0" : "=d" (value) : "a" (addr)); | ||
55 | #endif | ||
diff --git a/include/asm-m68k/msgbuf.h b/include/asm-m68k/msgbuf.h deleted file mode 100644 index 243cb798de8f..000000000000 --- a/include/asm-m68k/msgbuf.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #ifndef _M68K_MSGBUF_H | ||
2 | #define _M68K_MSGBUF_H | ||
3 | |||
4 | /* | ||
5 | * The msqid64_ds structure for m68k 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 | |||
14 | struct msqid64_ds { | ||
15 | struct ipc64_perm msg_perm; | ||
16 | __kernel_time_t msg_stime; /* last msgsnd time */ | ||
17 | unsigned long __unused1; | ||
18 | __kernel_time_t msg_rtime; /* last msgrcv time */ | ||
19 | unsigned long __unused2; | ||
20 | __kernel_time_t msg_ctime; /* last change time */ | ||
21 | unsigned long __unused3; | ||
22 | unsigned long msg_cbytes; /* current number of bytes on queue */ | ||
23 | unsigned long msg_qnum; /* number of messages in queue */ | ||
24 | unsigned long msg_qbytes; /* max number of bytes on queue */ | ||
25 | __kernel_pid_t msg_lspid; /* pid of last msgsnd */ | ||
26 | __kernel_pid_t msg_lrpid; /* last receive pid */ | ||
27 | unsigned long __unused4; | ||
28 | unsigned long __unused5; | ||
29 | }; | ||
30 | |||
31 | #endif /* _M68K_MSGBUF_H */ | ||
diff --git a/include/asm-m68k/mutex.h b/include/asm-m68k/mutex.h deleted file mode 100644 index 458c1f7fbc18..000000000000 --- a/include/asm-m68k/mutex.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | /* | ||
2 | * Pull in the generic implementation for the mutex fastpath. | ||
3 | * | ||
4 | * TODO: implement optimized primitives instead, or leave the generic | ||
5 | * implementation in place, or pick the atomic_xchg() based generic | ||
6 | * implementation. (see asm-generic/mutex-xchg.h for details) | ||
7 | */ | ||
8 | |||
9 | #include <asm-generic/mutex-dec.h> | ||
diff --git a/include/asm-m68k/mvme147hw.h b/include/asm-m68k/mvme147hw.h deleted file mode 100644 index b81043108472..000000000000 --- a/include/asm-m68k/mvme147hw.h +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | #ifndef _MVME147HW_H_ | ||
2 | #define _MVME147HW_H_ | ||
3 | |||
4 | #include <asm/irq.h> | ||
5 | |||
6 | typedef struct { | ||
7 | unsigned char | ||
8 | ctrl, | ||
9 | bcd_sec, | ||
10 | bcd_min, | ||
11 | bcd_hr, | ||
12 | bcd_dow, | ||
13 | bcd_dom, | ||
14 | bcd_mth, | ||
15 | bcd_year; | ||
16 | } MK48T02; | ||
17 | |||
18 | #define RTC_WRITE 0x80 | ||
19 | #define RTC_READ 0x40 | ||
20 | #define RTC_STOP 0x20 | ||
21 | |||
22 | #define m147_rtc ((MK48T02 * volatile)0xfffe07f8) | ||
23 | |||
24 | |||
25 | struct pcc_regs { | ||
26 | volatile u_long dma_tadr; | ||
27 | volatile u_long dma_dadr; | ||
28 | volatile u_long dma_bcr; | ||
29 | volatile u_long dma_hr; | ||
30 | volatile u_short t1_preload; | ||
31 | volatile u_short t1_count; | ||
32 | volatile u_short t2_preload; | ||
33 | volatile u_short t2_count; | ||
34 | volatile u_char t1_int_cntrl; | ||
35 | volatile u_char t1_cntrl; | ||
36 | volatile u_char t2_int_cntrl; | ||
37 | volatile u_char t2_cntrl; | ||
38 | volatile u_char ac_fail; | ||
39 | volatile u_char watchdog; | ||
40 | volatile u_char lpt_intr; | ||
41 | volatile u_char lpt_cntrl; | ||
42 | volatile u_char dma_intr; | ||
43 | volatile u_char dma_cntrl; | ||
44 | volatile u_char bus_error; | ||
45 | volatile u_char dma_status; | ||
46 | volatile u_char abort; | ||
47 | volatile u_char ta_fnctl; | ||
48 | volatile u_char serial_cntrl; | ||
49 | volatile u_char general_cntrl; | ||
50 | volatile u_char lan_cntrl; | ||
51 | volatile u_char general_status; | ||
52 | volatile u_char scsi_interrupt; | ||
53 | volatile u_char slave; | ||
54 | volatile u_char soft1_cntrl; | ||
55 | volatile u_char int_base; | ||
56 | volatile u_char soft2_cntrl; | ||
57 | volatile u_char revision_level; | ||
58 | volatile u_char lpt_data; | ||
59 | volatile u_char lpt_status; | ||
60 | }; | ||
61 | |||
62 | #define m147_pcc ((struct pcc_regs * volatile)0xfffe1000) | ||
63 | |||
64 | |||
65 | #define PCC_INT_ENAB 0x08 | ||
66 | |||
67 | #define PCC_TIMER_INT_CLR 0x80 | ||
68 | #define PCC_TIMER_PRELOAD 63936l | ||
69 | |||
70 | #define PCC_LEVEL_ABORT 0x07 | ||
71 | #define PCC_LEVEL_SERIAL 0x04 | ||
72 | #define PCC_LEVEL_ETH 0x04 | ||
73 | #define PCC_LEVEL_TIMER1 0x04 | ||
74 | #define PCC_LEVEL_SCSI_PORT 0x04 | ||
75 | #define PCC_LEVEL_SCSI_DMA 0x04 | ||
76 | |||
77 | #define PCC_IRQ_AC_FAIL (IRQ_USER+0) | ||
78 | #define PCC_IRQ_BERR (IRQ_USER+1) | ||
79 | #define PCC_IRQ_ABORT (IRQ_USER+2) | ||
80 | /* #define PCC_IRQ_SERIAL (IRQ_USER+3) */ | ||
81 | #define PCC_IRQ_PRINTER (IRQ_USER+7) | ||
82 | #define PCC_IRQ_TIMER1 (IRQ_USER+8) | ||
83 | #define PCC_IRQ_TIMER2 (IRQ_USER+9) | ||
84 | #define PCC_IRQ_SOFTWARE1 (IRQ_USER+10) | ||
85 | #define PCC_IRQ_SOFTWARE2 (IRQ_USER+11) | ||
86 | |||
87 | |||
88 | #define M147_SCC_A_ADDR 0xfffe3002 | ||
89 | #define M147_SCC_B_ADDR 0xfffe3000 | ||
90 | #define M147_SCC_PCLK 5000000 | ||
91 | |||
92 | #define MVME147_IRQ_SCSI_PORT (IRQ_USER+0x45) | ||
93 | #define MVME147_IRQ_SCSI_DMA (IRQ_USER+0x46) | ||
94 | |||
95 | /* SCC interrupts, for MVME147 */ | ||
96 | |||
97 | #define MVME147_IRQ_TYPE_PRIO 0 | ||
98 | #define MVME147_IRQ_SCC_BASE (IRQ_USER+32) | ||
99 | #define MVME147_IRQ_SCCB_TX (IRQ_USER+32) | ||
100 | #define MVME147_IRQ_SCCB_STAT (IRQ_USER+34) | ||
101 | #define MVME147_IRQ_SCCB_RX (IRQ_USER+36) | ||
102 | #define MVME147_IRQ_SCCB_SPCOND (IRQ_USER+38) | ||
103 | #define MVME147_IRQ_SCCA_TX (IRQ_USER+40) | ||
104 | #define MVME147_IRQ_SCCA_STAT (IRQ_USER+42) | ||
105 | #define MVME147_IRQ_SCCA_RX (IRQ_USER+44) | ||
106 | #define MVME147_IRQ_SCCA_SPCOND (IRQ_USER+46) | ||
107 | |||
108 | #define MVME147_LANCE_BASE 0xfffe1800 | ||
109 | #define MVME147_LANCE_IRQ (IRQ_USER+4) | ||
110 | |||
111 | #define ETHERNET_ADDRESS 0xfffe0778 | ||
112 | |||
113 | #endif | ||
diff --git a/include/asm-m68k/mvme16xhw.h b/include/asm-m68k/mvme16xhw.h deleted file mode 100644 index 6117f56653d2..000000000000 --- a/include/asm-m68k/mvme16xhw.h +++ /dev/null | |||
@@ -1,111 +0,0 @@ | |||
1 | #ifndef _M68K_MVME16xHW_H_ | ||
2 | #define _M68K_MVME16xHW_H_ | ||
3 | |||
4 | #include <asm/irq.h> | ||
5 | |||
6 | /* Board ID data structure - pointer to this retrieved from Bug by head.S */ | ||
7 | |||
8 | /* Note, bytes 12 and 13 are board no in BCD (0162,0166,0167,0177,etc) */ | ||
9 | |||
10 | extern long mvme_bdid_ptr; | ||
11 | |||
12 | typedef struct { | ||
13 | char bdid[4]; | ||
14 | u_char rev, mth, day, yr; | ||
15 | u_short size, reserved; | ||
16 | u_short brdno; | ||
17 | char brdsuffix[2]; | ||
18 | u_long options; | ||
19 | u_short clun, dlun, ctype, dnum; | ||
20 | u_long option2; | ||
21 | } t_bdid, *p_bdid; | ||
22 | |||
23 | |||
24 | typedef struct { | ||
25 | u_char ack_icr, | ||
26 | flt_icr, | ||
27 | sel_icr, | ||
28 | pe_icr, | ||
29 | bsy_icr, | ||
30 | spare1, | ||
31 | isr, | ||
32 | cr, | ||
33 | spare2, | ||
34 | spare3, | ||
35 | spare4, | ||
36 | data; | ||
37 | } MVMElp, *MVMElpPtr; | ||
38 | |||
39 | #define MVME_LPR_BASE 0xfff42030 | ||
40 | |||
41 | #define mvmelp ((*(volatile MVMElpPtr)(MVME_LPR_BASE))) | ||
42 | |||
43 | typedef struct { | ||
44 | unsigned char | ||
45 | ctrl, | ||
46 | bcd_sec, | ||
47 | bcd_min, | ||
48 | bcd_hr, | ||
49 | bcd_dow, | ||
50 | bcd_dom, | ||
51 | bcd_mth, | ||
52 | bcd_year; | ||
53 | } MK48T08_t, *MK48T08ptr_t; | ||
54 | |||
55 | #define RTC_WRITE 0x80 | ||
56 | #define RTC_READ 0x40 | ||
57 | #define RTC_STOP 0x20 | ||
58 | |||
59 | #define MVME_RTC_BASE 0xfffc1ff8 | ||
60 | |||
61 | #define MVME_I596_BASE 0xfff46000 | ||
62 | |||
63 | #define MVME_SCC_A_ADDR 0xfff45005 | ||
64 | #define MVME_SCC_B_ADDR 0xfff45001 | ||
65 | #define MVME_SCC_PCLK 10000000 | ||
66 | |||
67 | #define MVME162_IRQ_TYPE_PRIO 0 | ||
68 | |||
69 | #define MVME167_IRQ_PRN (IRQ_USER+20) | ||
70 | #define MVME16x_IRQ_I596 (IRQ_USER+23) | ||
71 | #define MVME16x_IRQ_SCSI (IRQ_USER+21) | ||
72 | #define MVME16x_IRQ_FLY (IRQ_USER+63) | ||
73 | #define MVME167_IRQ_SER_ERR (IRQ_USER+28) | ||
74 | #define MVME167_IRQ_SER_MODEM (IRQ_USER+29) | ||
75 | #define MVME167_IRQ_SER_TX (IRQ_USER+30) | ||
76 | #define MVME167_IRQ_SER_RX (IRQ_USER+31) | ||
77 | #define MVME16x_IRQ_TIMER (IRQ_USER+25) | ||
78 | #define MVME167_IRQ_ABORT (IRQ_USER+46) | ||
79 | #define MVME162_IRQ_ABORT (IRQ_USER+30) | ||
80 | |||
81 | /* SCC interrupts, for MVME162 */ | ||
82 | #define MVME162_IRQ_SCC_BASE (IRQ_USER+0) | ||
83 | #define MVME162_IRQ_SCCB_TX (IRQ_USER+0) | ||
84 | #define MVME162_IRQ_SCCB_STAT (IRQ_USER+2) | ||
85 | #define MVME162_IRQ_SCCB_RX (IRQ_USER+4) | ||
86 | #define MVME162_IRQ_SCCB_SPCOND (IRQ_USER+6) | ||
87 | #define MVME162_IRQ_SCCA_TX (IRQ_USER+8) | ||
88 | #define MVME162_IRQ_SCCA_STAT (IRQ_USER+10) | ||
89 | #define MVME162_IRQ_SCCA_RX (IRQ_USER+12) | ||
90 | #define MVME162_IRQ_SCCA_SPCOND (IRQ_USER+14) | ||
91 | |||
92 | /* MVME162 version register */ | ||
93 | |||
94 | #define MVME162_VERSION_REG 0xfff4202e | ||
95 | |||
96 | extern unsigned short mvme16x_config; | ||
97 | |||
98 | /* Lower 8 bits must match the revision register in the MC2 chip */ | ||
99 | |||
100 | #define MVME16x_CONFIG_SPEED_32 0x0001 | ||
101 | #define MVME16x_CONFIG_NO_VMECHIP2 0x0002 | ||
102 | #define MVME16x_CONFIG_NO_SCSICHIP 0x0004 | ||
103 | #define MVME16x_CONFIG_NO_ETHERNET 0x0008 | ||
104 | #define MVME16x_CONFIG_GOT_FPU 0x0010 | ||
105 | |||
106 | #define MVME16x_CONFIG_GOT_LP 0x0100 | ||
107 | #define MVME16x_CONFIG_GOT_CD2401 0x0200 | ||
108 | #define MVME16x_CONFIG_GOT_SCCA 0x0400 | ||
109 | #define MVME16x_CONFIG_GOT_SCCB 0x0800 | ||
110 | |||
111 | #endif | ||
diff --git a/include/asm-m68k/nubus.h b/include/asm-m68k/nubus.h deleted file mode 100644 index d6be9976f1ae..000000000000 --- a/include/asm-m68k/nubus.h +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_NUBUS_H | ||
2 | #define _ASM_M68K_NUBUS_H | ||
3 | |||
4 | #include <asm/raw_io.h> | ||
5 | |||
6 | #define nubus_readb raw_inb | ||
7 | #define nubus_readw raw_inw | ||
8 | #define nubus_readl raw_inl | ||
9 | |||
10 | #define nubus_writeb raw_outb | ||
11 | #define nubus_writew raw_outw | ||
12 | #define nubus_writel raw_outl | ||
13 | |||
14 | #define nubus_memset_io(a,b,c) memset((void *)(a),(b),(c)) | ||
15 | #define nubus_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) | ||
16 | #define nubus_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) | ||
17 | |||
18 | static inline void *nubus_remap_nocache_ser(unsigned long physaddr, | ||
19 | unsigned long size) | ||
20 | { | ||
21 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
22 | } | ||
23 | |||
24 | static inline void *nubus_remap_nocache_nonser(unsigned long physaddr, | ||
25 | unsigned long size) | ||
26 | { | ||
27 | return __ioremap(physaddr, size, IOMAP_NOCACHE_NONSER); | ||
28 | } | ||
29 | |||
30 | static inline void *nbus_remap_writethrough(unsigned long physaddr, | ||
31 | unsigned long size) | ||
32 | { | ||
33 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
34 | } | ||
35 | |||
36 | static inline void *nubus_remap_fullcache(unsigned long physaddr, | ||
37 | unsigned long size) | ||
38 | { | ||
39 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); | ||
40 | } | ||
41 | |||
42 | #define nubus_unmap iounmap | ||
43 | #define nubus_iounmap iounmap | ||
44 | #define nubus_ioremap nubus_remap_nocache_ser | ||
45 | |||
46 | #endif /* _ASM_NUBUS_H */ | ||
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h deleted file mode 100644 index d33cdadf78e1..000000000000 --- a/include/asm-m68k/openprom.h +++ /dev/null | |||
@@ -1,312 +0,0 @@ | |||
1 | #ifndef __SPARC_OPENPROM_H | ||
2 | #define __SPARC_OPENPROM_H | ||
3 | |||
4 | /* openprom.h: Prom structures and defines for access to the OPENBOOT | ||
5 | * prom routines and data areas. | ||
6 | * | ||
7 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | ||
8 | */ | ||
9 | |||
10 | |||
11 | /* Empirical constants... */ | ||
12 | #ifdef CONFIG_SUN3 | ||
13 | #define KADB_DEBUGGER_BEGVM 0x0fee0000 /* There is no kadb yet but...*/ | ||
14 | #define LINUX_OPPROM_BEGVM 0x0fef0000 | ||
15 | #define LINUX_OPPROM_ENDVM 0x0ff10000 /* I think this is right - tm */ | ||
16 | #else | ||
17 | #define KADB_DEBUGGER_BEGVM 0xffc00000 /* Where kern debugger is in virt-mem */ | ||
18 | #define LINUX_OPPROM_BEGVM 0xffd00000 | ||
19 | #define LINUX_OPPROM_ENDVM 0xfff00000 | ||
20 | #define LINUX_OPPROM_MAGIC 0x10010407 | ||
21 | #endif | ||
22 | |||
23 | #ifndef __ASSEMBLY__ | ||
24 | /* V0 prom device operations. */ | ||
25 | struct linux_dev_v0_funcs { | ||
26 | int (*v0_devopen)(char *device_str); | ||
27 | int (*v0_devclose)(int dev_desc); | ||
28 | int (*v0_rdblkdev)(int dev_desc, int num_blks, int blk_st, char *buf); | ||
29 | int (*v0_wrblkdev)(int dev_desc, int num_blks, int blk_st, char *buf); | ||
30 | int (*v0_wrnetdev)(int dev_desc, int num_bytes, char *buf); | ||
31 | int (*v0_rdnetdev)(int dev_desc, int num_bytes, char *buf); | ||
32 | int (*v0_rdchardev)(int dev_desc, int num_bytes, int dummy, char *buf); | ||
33 | int (*v0_wrchardev)(int dev_desc, int num_bytes, int dummy, char *buf); | ||
34 | int (*v0_seekdev)(int dev_desc, long logical_offst, int from); | ||
35 | }; | ||
36 | |||
37 | /* V2 and later prom device operations. */ | ||
38 | struct linux_dev_v2_funcs { | ||
39 | int (*v2_inst2pkg)(int d); /* Convert ihandle to phandle */ | ||
40 | char * (*v2_dumb_mem_alloc)(char *va, unsigned sz); | ||
41 | void (*v2_dumb_mem_free)(char *va, unsigned sz); | ||
42 | |||
43 | /* To map devices into virtual I/O space. */ | ||
44 | char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned paddr, unsigned sz); | ||
45 | void (*v2_dumb_munmap)(char *virta, unsigned size); | ||
46 | |||
47 | int (*v2_dev_open)(char *devpath); | ||
48 | void (*v2_dev_close)(int d); | ||
49 | int (*v2_dev_read)(int d, char *buf, int nbytes); | ||
50 | int (*v2_dev_write)(int d, char *buf, int nbytes); | ||
51 | int (*v2_dev_seek)(int d, int hi, int lo); | ||
52 | |||
53 | /* Never issued (multistage load support) */ | ||
54 | void (*v2_wheee2)(void); | ||
55 | void (*v2_wheee3)(void); | ||
56 | }; | ||
57 | |||
58 | struct linux_mlist_v0 { | ||
59 | struct linux_mlist_v0 *theres_more; | ||
60 | char *start_adr; | ||
61 | unsigned num_bytes; | ||
62 | }; | ||
63 | |||
64 | struct linux_mem_v0 { | ||
65 | struct linux_mlist_v0 **v0_totphys; | ||
66 | struct linux_mlist_v0 **v0_prommap; | ||
67 | struct linux_mlist_v0 **v0_available; /* What we can use */ | ||
68 | }; | ||
69 | |||
70 | /* Arguments sent to the kernel from the boot prompt. */ | ||
71 | struct linux_arguments_v0 { | ||
72 | char *argv[8]; | ||
73 | char args[100]; | ||
74 | char boot_dev[2]; | ||
75 | int boot_dev_ctrl; | ||
76 | int boot_dev_unit; | ||
77 | int dev_partition; | ||
78 | char *kernel_file_name; | ||
79 | void *aieee1; /* XXX */ | ||
80 | }; | ||
81 | |||
82 | /* V2 and up boot things. */ | ||
83 | struct linux_bootargs_v2 { | ||
84 | char **bootpath; | ||
85 | char **bootargs; | ||
86 | int *fd_stdin; | ||
87 | int *fd_stdout; | ||
88 | }; | ||
89 | |||
90 | #if defined(CONFIG_SUN3) || defined(CONFIG_SUN3X) | ||
91 | struct linux_romvec { | ||
92 | char *pv_initsp; | ||
93 | int (*pv_startmon)(void); | ||
94 | |||
95 | int *diagberr; | ||
96 | |||
97 | struct linux_arguments_v0 **pv_v0bootargs; | ||
98 | unsigned *pv_sun3mem; | ||
99 | |||
100 | unsigned char (*pv_getchar)(void); | ||
101 | int (*pv_putchar)(int ch); | ||
102 | int (*pv_nbgetchar)(void); | ||
103 | int (*pv_nbputchar)(int ch); | ||
104 | unsigned char *pv_echo; | ||
105 | unsigned char *pv_insource; | ||
106 | unsigned char *pv_outsink; | ||
107 | |||
108 | int (*pv_getkey)(void); | ||
109 | int (*pv_initgetkey)(void); | ||
110 | unsigned int *pv_translation; | ||
111 | unsigned char *pv_keybid; | ||
112 | int *pv_screen_x; | ||
113 | int *pv_screen_y; | ||
114 | struct keybuf *pv_keybuf; | ||
115 | |||
116 | char *pv_monid; | ||
117 | |||
118 | /* | ||
119 | * Frame buffer output and terminal emulation | ||
120 | */ | ||
121 | |||
122 | int (*pv_fbwritechar)(char); | ||
123 | int *pv_fbaddr; | ||
124 | char **pv_font; | ||
125 | int (*pv_fbwritestr)(char); | ||
126 | |||
127 | void (*pv_reboot)(char *bootstr); | ||
128 | |||
129 | /* | ||
130 | * Line input and parsing | ||
131 | */ | ||
132 | |||
133 | unsigned char *pv_linebuf; | ||
134 | unsigned char **pv_lineptr; | ||
135 | int *pv_linesize; | ||
136 | int (*pv_getline)(void); | ||
137 | unsigned char (*pv_getnextchar)(void); | ||
138 | unsigned char (*pv_peeknextchar)(void); | ||
139 | int *pv_fbthere; | ||
140 | int (*pv_getnum)(void); | ||
141 | |||
142 | void (*pv_printf)(const char *fmt, ...); | ||
143 | int (*pv_printhex)(void); | ||
144 | |||
145 | unsigned char *pv_leds; | ||
146 | int (*pv_setleds)(void); | ||
147 | |||
148 | /* | ||
149 | * Non-maskable interrupt (nmi) information | ||
150 | */ | ||
151 | |||
152 | int (*pv_nmiaddr)(void); | ||
153 | int (*pv_abortentry)(void); | ||
154 | int *pv_nmiclock; | ||
155 | |||
156 | int *pv_fbtype; | ||
157 | |||
158 | /* | ||
159 | * Assorted other things | ||
160 | */ | ||
161 | |||
162 | unsigned pv_romvers; | ||
163 | struct globram *pv_globram; | ||
164 | char *pv_kbdzscc; | ||
165 | |||
166 | int *pv_keyrinit; | ||
167 | unsigned char *pv_keyrtick; | ||
168 | unsigned *pv_memoryavail; | ||
169 | long *pv_resetaddr; | ||
170 | long *pv_resetmap; | ||
171 | |||
172 | void (*pv_halt)(void); | ||
173 | unsigned char *pv_memorybitmap; | ||
174 | |||
175 | #ifdef CONFIG_SUN3 | ||
176 | void (*pv_setctxt)(int ctxt, char *va, int pmeg); | ||
177 | void (*pv_vector_cmd)(void); | ||
178 | int dummy1z; | ||
179 | int dummy2z; | ||
180 | int dummy3z; | ||
181 | int dummy4z; | ||
182 | #endif | ||
183 | }; | ||
184 | #else | ||
185 | /* The top level PROM vector. */ | ||
186 | struct linux_romvec { | ||
187 | /* Version numbers. */ | ||
188 | unsigned int pv_magic_cookie; | ||
189 | unsigned int pv_romvers; | ||
190 | unsigned int pv_plugin_revision; | ||
191 | unsigned int pv_printrev; | ||
192 | |||
193 | /* Version 0 memory descriptors. */ | ||
194 | struct linux_mem_v0 pv_v0mem; | ||
195 | |||
196 | /* Node operations. */ | ||
197 | struct linux_nodeops *pv_nodeops; | ||
198 | |||
199 | char **pv_bootstr; | ||
200 | struct linux_dev_v0_funcs pv_v0devops; | ||
201 | |||
202 | char *pv_stdin; | ||
203 | char *pv_stdout; | ||
204 | #define PROMDEV_KBD 0 /* input from keyboard */ | ||
205 | #define PROMDEV_SCREEN 0 /* output to screen */ | ||
206 | #define PROMDEV_TTYA 1 /* in/out to ttya */ | ||
207 | #define PROMDEV_TTYB 2 /* in/out to ttyb */ | ||
208 | |||
209 | /* Blocking getchar/putchar. NOT REENTRANT! (grr) */ | ||
210 | int (*pv_getchar)(void); | ||
211 | void (*pv_putchar)(int ch); | ||
212 | |||
213 | /* Non-blocking variants. */ | ||
214 | int (*pv_nbgetchar)(void); | ||
215 | int (*pv_nbputchar)(int ch); | ||
216 | |||
217 | void (*pv_putstr)(char *str, int len); | ||
218 | |||
219 | /* Miscellany. */ | ||
220 | void (*pv_reboot)(char *bootstr); | ||
221 | void (*pv_printf)(__const__ char *fmt, ...); | ||
222 | void (*pv_abort)(void); | ||
223 | __volatile__ int *pv_ticks; | ||
224 | void (*pv_halt)(void); | ||
225 | void (**pv_synchook)(void); | ||
226 | |||
227 | /* Evaluate a forth string, not different proto for V0 and V2->up. */ | ||
228 | union { | ||
229 | void (*v0_eval)(int len, char *str); | ||
230 | void (*v2_eval)(char *str); | ||
231 | } pv_fortheval; | ||
232 | |||
233 | struct linux_arguments_v0 **pv_v0bootargs; | ||
234 | |||
235 | /* Get ether address. */ | ||
236 | unsigned int (*pv_enaddr)(int d, char *enaddr); | ||
237 | |||
238 | struct linux_bootargs_v2 pv_v2bootargs; | ||
239 | struct linux_dev_v2_funcs pv_v2devops; | ||
240 | |||
241 | int filler[15]; | ||
242 | |||
243 | /* This one is sun4c/sun4 only. */ | ||
244 | void (*pv_setctxt)(int ctxt, char *va, int pmeg); | ||
245 | |||
246 | /* Prom version 3 Multiprocessor routines. This stuff is crazy. | ||
247 | * No joke. Calling these when there is only one cpu probably | ||
248 | * crashes the machine, have to test this. :-) | ||
249 | */ | ||
250 | |||
251 | /* v3_cpustart() will start the cpu 'whichcpu' in mmu-context | ||
252 | * 'thiscontext' executing at address 'prog_counter' | ||
253 | */ | ||
254 | int (*v3_cpustart)(unsigned int whichcpu, int ctxtbl_ptr, | ||
255 | int thiscontext, char *prog_counter); | ||
256 | |||
257 | /* v3_cpustop() will cause cpu 'whichcpu' to stop executing | ||
258 | * until a resume cpu call is made. | ||
259 | */ | ||
260 | int (*v3_cpustop)(unsigned int whichcpu); | ||
261 | |||
262 | /* v3_cpuidle() will idle cpu 'whichcpu' until a stop or | ||
263 | * resume cpu call is made. | ||
264 | */ | ||
265 | int (*v3_cpuidle)(unsigned int whichcpu); | ||
266 | |||
267 | /* v3_cpuresume() will resume processor 'whichcpu' executing | ||
268 | * starting with whatever 'pc' and 'npc' were left at the | ||
269 | * last 'idle' or 'stop' call. | ||
270 | */ | ||
271 | int (*v3_cpuresume)(unsigned int whichcpu); | ||
272 | }; | ||
273 | #endif | ||
274 | |||
275 | /* Routines for traversing the prom device tree. */ | ||
276 | struct linux_nodeops { | ||
277 | int (*no_nextnode)(int node); | ||
278 | int (*no_child)(int node); | ||
279 | int (*no_proplen)(int node, char *name); | ||
280 | int (*no_getprop)(int node, char *name, char *val); | ||
281 | int (*no_setprop)(int node, char *name, char *val, int len); | ||
282 | char * (*no_nextprop)(int node, char *name); | ||
283 | }; | ||
284 | |||
285 | /* More fun PROM structures for device probing. */ | ||
286 | #define PROMREG_MAX 16 | ||
287 | #define PROMVADDR_MAX 16 | ||
288 | #define PROMINTR_MAX 15 | ||
289 | |||
290 | struct linux_prom_registers { | ||
291 | int which_io; /* is this in OBIO space? */ | ||
292 | char *phys_addr; /* The physical address of this register */ | ||
293 | int reg_size; /* How many bytes does this register take up? */ | ||
294 | }; | ||
295 | |||
296 | struct linux_prom_irqs { | ||
297 | int pri; /* IRQ priority */ | ||
298 | int vector; /* This is foobar, what does it do? */ | ||
299 | }; | ||
300 | |||
301 | /* Element of the "ranges" vector */ | ||
302 | struct linux_prom_ranges { | ||
303 | unsigned int ot_child_space; | ||
304 | unsigned int ot_child_base; /* Bus feels this */ | ||
305 | unsigned int ot_parent_space; | ||
306 | unsigned int ot_parent_base; /* CPU looks from here */ | ||
307 | unsigned int or_size; | ||
308 | }; | ||
309 | |||
310 | #endif /* !(__ASSEMBLY__) */ | ||
311 | |||
312 | #endif /* !(__SPARC_OPENPROM_H) */ | ||
diff --git a/include/asm-m68k/oplib.h b/include/asm-m68k/oplib.h deleted file mode 100644 index f082d03336bd..000000000000 --- a/include/asm-m68k/oplib.h +++ /dev/null | |||
@@ -1,291 +0,0 @@ | |||
1 | /* | ||
2 | * oplib.h: Describes the interface and available routines in the | ||
3 | * Linux Prom library. | ||
4 | * | ||
5 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | ||
6 | */ | ||
7 | |||
8 | #ifndef __SPARC_OPLIB_H | ||
9 | #define __SPARC_OPLIB_H | ||
10 | |||
11 | #include <asm/openprom.h> | ||
12 | |||
13 | /* The master romvec pointer... */ | ||
14 | extern struct linux_romvec *romvec; | ||
15 | |||
16 | /* Enumeration to describe the prom major version we have detected. */ | ||
17 | enum prom_major_version { | ||
18 | PROM_V0, /* Original sun4c V0 prom */ | ||
19 | PROM_V2, /* sun4c and early sun4m V2 prom */ | ||
20 | PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */ | ||
21 | PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */ | ||
22 | }; | ||
23 | |||
24 | extern enum prom_major_version prom_vers; | ||
25 | /* Revision, and firmware revision. */ | ||
26 | extern unsigned int prom_rev, prom_prev; | ||
27 | |||
28 | /* Root node of the prom device tree, this stays constant after | ||
29 | * initialization is complete. | ||
30 | */ | ||
31 | extern int prom_root_node; | ||
32 | |||
33 | /* Pointer to prom structure containing the device tree traversal | ||
34 | * and usage utility functions. Only prom-lib should use these, | ||
35 | * users use the interface defined by the library only! | ||
36 | */ | ||
37 | extern struct linux_nodeops *prom_nodeops; | ||
38 | |||
39 | /* The functions... */ | ||
40 | |||
41 | /* You must call prom_init() before using any of the library services, | ||
42 | * preferably as early as possible. Pass it the romvec pointer. | ||
43 | */ | ||
44 | extern void prom_init(struct linux_romvec *rom_ptr); | ||
45 | |||
46 | /* Boot argument acquisition, returns the boot command line string. */ | ||
47 | extern char *prom_getbootargs(void); | ||
48 | |||
49 | /* Device utilities. */ | ||
50 | |||
51 | /* Map and unmap devices in IO space at virtual addresses. Note that the | ||
52 | * virtual address you pass is a request and the prom may put your mappings | ||
53 | * somewhere else, so check your return value as that is where your new | ||
54 | * mappings really are! | ||
55 | * | ||
56 | * Another note, these are only available on V2 or higher proms! | ||
57 | */ | ||
58 | extern char *prom_mapio(char *virt_hint, int io_space, unsigned int phys_addr, unsigned int num_bytes); | ||
59 | extern void prom_unmapio(char *virt_addr, unsigned int num_bytes); | ||
60 | |||
61 | /* Device operations. */ | ||
62 | |||
63 | /* Open the device described by the passed string. Note, that the format | ||
64 | * of the string is different on V0 vs. V2->higher proms. The caller must | ||
65 | * know what he/she is doing! Returns the device descriptor, an int. | ||
66 | */ | ||
67 | extern int prom_devopen(char *device_string); | ||
68 | |||
69 | /* Close a previously opened device described by the passed integer | ||
70 | * descriptor. | ||
71 | */ | ||
72 | extern int prom_devclose(int device_handle); | ||
73 | |||
74 | /* Do a seek operation on the device described by the passed integer | ||
75 | * descriptor. | ||
76 | */ | ||
77 | extern void prom_seek(int device_handle, unsigned int seek_hival, | ||
78 | unsigned int seek_lowval); | ||
79 | |||
80 | /* Machine memory configuration routine. */ | ||
81 | |||
82 | /* This function returns a V0 format memory descriptor table, it has three | ||
83 | * entries. One for the total amount of physical ram on the machine, one | ||
84 | * for the amount of physical ram available, and one describing the virtual | ||
85 | * areas which are allocated by the prom. So, in a sense the physical | ||
86 | * available is a calculation of the total physical minus the physical mapped | ||
87 | * by the prom with virtual mappings. | ||
88 | * | ||
89 | * These lists are returned pre-sorted, this should make your life easier | ||
90 | * since the prom itself is way too lazy to do such nice things. | ||
91 | */ | ||
92 | extern struct linux_mem_v0 *prom_meminfo(void); | ||
93 | |||
94 | /* Miscellaneous routines, don't really fit in any category per se. */ | ||
95 | |||
96 | /* Reboot the machine with the command line passed. */ | ||
97 | extern void prom_reboot(char *boot_command); | ||
98 | |||
99 | /* Evaluate the forth string passed. */ | ||
100 | extern void prom_feval(char *forth_string); | ||
101 | |||
102 | /* Enter the prom, with possibility of continuation with the 'go' | ||
103 | * command in newer proms. | ||
104 | */ | ||
105 | extern void prom_cmdline(void); | ||
106 | |||
107 | /* Enter the prom, with no chance of continuation for the stand-alone | ||
108 | * which calls this. | ||
109 | */ | ||
110 | extern void prom_halt(void); | ||
111 | |||
112 | /* Set the PROM 'sync' callback function to the passed function pointer. | ||
113 | * When the user gives the 'sync' command at the prom prompt while the | ||
114 | * kernel is still active, the prom will call this routine. | ||
115 | * | ||
116 | * XXX The arguments are different on V0 vs. V2->higher proms, grrr! XXX | ||
117 | */ | ||
118 | typedef void (*sync_func_t)(void); | ||
119 | extern void prom_setsync(sync_func_t func_ptr); | ||
120 | |||
121 | /* Acquire the IDPROM of the root node in the prom device tree. This | ||
122 | * gets passed a buffer where you would like it stuffed. The return value | ||
123 | * is the format type of this idprom or 0xff on error. | ||
124 | */ | ||
125 | extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size); | ||
126 | |||
127 | /* Get the prom major version. */ | ||
128 | extern int prom_version(void); | ||
129 | |||
130 | /* Get the prom plugin revision. */ | ||
131 | extern int prom_getrev(void); | ||
132 | |||
133 | /* Get the prom firmware revision. */ | ||
134 | extern int prom_getprev(void); | ||
135 | |||
136 | /* Character operations to/from the console.... */ | ||
137 | |||
138 | /* Non-blocking get character from console. */ | ||
139 | extern int prom_nbgetchar(void); | ||
140 | |||
141 | /* Non-blocking put character to console. */ | ||
142 | extern int prom_nbputchar(char character); | ||
143 | |||
144 | /* Blocking get character from console. */ | ||
145 | extern char prom_getchar(void); | ||
146 | |||
147 | /* Blocking put character to console. */ | ||
148 | extern void prom_putchar(char character); | ||
149 | |||
150 | /* Prom's internal printf routine, don't use in kernel/boot code. */ | ||
151 | void prom_printf(char *fmt, ...); | ||
152 | |||
153 | /* Query for input device type */ | ||
154 | |||
155 | enum prom_input_device { | ||
156 | PROMDEV_IKBD, /* input from keyboard */ | ||
157 | PROMDEV_ITTYA, /* input from ttya */ | ||
158 | PROMDEV_ITTYB, /* input from ttyb */ | ||
159 | PROMDEV_I_UNK, | ||
160 | }; | ||
161 | |||
162 | extern enum prom_input_device prom_query_input_device(void); | ||
163 | |||
164 | /* Query for output device type */ | ||
165 | |||
166 | enum prom_output_device { | ||
167 | PROMDEV_OSCREEN, /* to screen */ | ||
168 | PROMDEV_OTTYA, /* to ttya */ | ||
169 | PROMDEV_OTTYB, /* to ttyb */ | ||
170 | PROMDEV_O_UNK, | ||
171 | }; | ||
172 | |||
173 | extern enum prom_output_device prom_query_output_device(void); | ||
174 | |||
175 | /* Multiprocessor operations... */ | ||
176 | |||
177 | /* Start the CPU with the given device tree node, context table, and context | ||
178 | * at the passed program counter. | ||
179 | */ | ||
180 | extern int prom_startcpu(int cpunode, struct linux_prom_registers *context_table, | ||
181 | int context, char *program_counter); | ||
182 | |||
183 | /* Stop the CPU with the passed device tree node. */ | ||
184 | extern int prom_stopcpu(int cpunode); | ||
185 | |||
186 | /* Idle the CPU with the passed device tree node. */ | ||
187 | extern int prom_idlecpu(int cpunode); | ||
188 | |||
189 | /* Re-Start the CPU with the passed device tree node. */ | ||
190 | extern int prom_restartcpu(int cpunode); | ||
191 | |||
192 | /* PROM memory allocation facilities... */ | ||
193 | |||
194 | /* Allocated at possibly the given virtual address a chunk of the | ||
195 | * indicated size. | ||
196 | */ | ||
197 | extern char *prom_alloc(char *virt_hint, unsigned int size); | ||
198 | |||
199 | /* Free a previously allocated chunk. */ | ||
200 | extern void prom_free(char *virt_addr, unsigned int size); | ||
201 | |||
202 | /* Sun4/sun4c specific memory-management startup hook. */ | ||
203 | |||
204 | /* Map the passed segment in the given context at the passed | ||
205 | * virtual address. | ||
206 | */ | ||
207 | extern void prom_putsegment(int context, unsigned long virt_addr, | ||
208 | int physical_segment); | ||
209 | |||
210 | /* PROM device tree traversal functions... */ | ||
211 | |||
212 | /* Get the child node of the given node, or zero if no child exists. */ | ||
213 | extern int prom_getchild(int parent_node); | ||
214 | |||
215 | /* Get the next sibling node of the given node, or zero if no further | ||
216 | * siblings exist. | ||
217 | */ | ||
218 | extern int prom_getsibling(int node); | ||
219 | |||
220 | /* Get the length, at the passed node, of the given property type. | ||
221 | * Returns -1 on error (ie. no such property at this node). | ||
222 | */ | ||
223 | extern int prom_getproplen(int thisnode, char *property); | ||
224 | |||
225 | /* Fetch the requested property using the given buffer. Returns | ||
226 | * the number of bytes the prom put into your buffer or -1 on error. | ||
227 | */ | ||
228 | extern int prom_getproperty(int thisnode, char *property, | ||
229 | char *prop_buffer, int propbuf_size); | ||
230 | |||
231 | /* Acquire an integer property. */ | ||
232 | extern int prom_getint(int node, char *property); | ||
233 | |||
234 | /* Acquire an integer property, with a default value. */ | ||
235 | extern int prom_getintdefault(int node, char *property, int defval); | ||
236 | |||
237 | /* Acquire a boolean property, 0=FALSE 1=TRUE. */ | ||
238 | extern int prom_getbool(int node, char *prop); | ||
239 | |||
240 | /* Acquire a string property, null string on error. */ | ||
241 | extern void prom_getstring(int node, char *prop, char *buf, int bufsize); | ||
242 | |||
243 | /* Does the passed node have the given "name"? YES=1 NO=0 */ | ||
244 | extern int prom_nodematch(int thisnode, char *name); | ||
245 | |||
246 | /* Search all siblings starting at the passed node for "name" matching | ||
247 | * the given string. Returns the node on success, zero on failure. | ||
248 | */ | ||
249 | extern int prom_searchsiblings(int node_start, char *name); | ||
250 | |||
251 | /* Return the first property type, as a string, for the given node. | ||
252 | * Returns a null string on error. | ||
253 | */ | ||
254 | extern char *prom_firstprop(int node); | ||
255 | |||
256 | /* Returns the next property after the passed property for the given | ||
257 | * node. Returns null string on failure. | ||
258 | */ | ||
259 | extern char *prom_nextprop(int node, char *prev_property); | ||
260 | |||
261 | /* Returns 1 if the specified node has given property. */ | ||
262 | extern int prom_node_has_property(int node, char *property); | ||
263 | |||
264 | /* Set the indicated property at the given node with the passed value. | ||
265 | * Returns the number of bytes of your value that the prom took. | ||
266 | */ | ||
267 | extern int prom_setprop(int node, char *prop_name, char *prop_value, | ||
268 | int value_size); | ||
269 | |||
270 | extern int prom_pathtoinode(char *path); | ||
271 | extern int prom_inst2pkg(int); | ||
272 | |||
273 | /* Dorking with Bus ranges... */ | ||
274 | |||
275 | /* Adjust reg values with the passed ranges. */ | ||
276 | extern void prom_adjust_regs(struct linux_prom_registers *regp, int nregs, | ||
277 | struct linux_prom_ranges *rangep, int nranges); | ||
278 | |||
279 | /* Adjust child ranges with the passed parent ranges. */ | ||
280 | extern void prom_adjust_ranges(struct linux_prom_ranges *cranges, int ncranges, | ||
281 | struct linux_prom_ranges *pranges, int npranges); | ||
282 | |||
283 | /* Apply promlib probed OBIO ranges to registers. */ | ||
284 | extern void prom_apply_obio_ranges(struct linux_prom_registers *obioregs, int nregs); | ||
285 | |||
286 | /* Apply ranges of any prom node (and optionally parent node as well) to registers. */ | ||
287 | extern void prom_apply_generic_ranges(int node, int parent, | ||
288 | struct linux_prom_registers *sbusregs, int nregs); | ||
289 | |||
290 | |||
291 | #endif /* !(__SPARC_OPLIB_H) */ | ||
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h deleted file mode 100644 index a34b8bad7847..000000000000 --- a/include/asm-m68k/page.h +++ /dev/null | |||
@@ -1,228 +0,0 @@ | |||
1 | #ifndef _M68K_PAGE_H | ||
2 | #define _M68K_PAGE_H | ||
3 | |||
4 | #include <linux/const.h> | ||
5 | |||
6 | /* PAGE_SHIFT determines the page size */ | ||
7 | #ifndef CONFIG_SUN3 | ||
8 | #define PAGE_SHIFT (12) | ||
9 | #else | ||
10 | #define PAGE_SHIFT (13) | ||
11 | #endif | ||
12 | #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) | ||
13 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ||
14 | |||
15 | #include <asm/setup.h> | ||
16 | |||
17 | #if PAGE_SHIFT < 13 | ||
18 | #define THREAD_SIZE (8192) | ||
19 | #else | ||
20 | #define THREAD_SIZE PAGE_SIZE | ||
21 | #endif | ||
22 | |||
23 | #ifndef __ASSEMBLY__ | ||
24 | |||
25 | #include <linux/compiler.h> | ||
26 | |||
27 | #include <asm/module.h> | ||
28 | |||
29 | #define get_user_page(vaddr) __get_free_page(GFP_KERNEL) | ||
30 | #define free_user_page(page, addr) free_page(addr) | ||
31 | |||
32 | /* | ||
33 | * We don't need to check for alignment etc. | ||
34 | */ | ||
35 | #ifdef CPU_M68040_OR_M68060_ONLY | ||
36 | static inline void copy_page(void *to, void *from) | ||
37 | { | ||
38 | unsigned long tmp; | ||
39 | |||
40 | __asm__ __volatile__("1:\t" | ||
41 | ".chip 68040\n\t" | ||
42 | "move16 %1@+,%0@+\n\t" | ||
43 | "move16 %1@+,%0@+\n\t" | ||
44 | ".chip 68k\n\t" | ||
45 | "dbra %2,1b\n\t" | ||
46 | : "=a" (to), "=a" (from), "=d" (tmp) | ||
47 | : "0" (to), "1" (from) , "2" (PAGE_SIZE / 32 - 1) | ||
48 | ); | ||
49 | } | ||
50 | |||
51 | static inline void clear_page(void *page) | ||
52 | { | ||
53 | unsigned long tmp; | ||
54 | unsigned long *sp = page; | ||
55 | |||
56 | *sp++ = 0; | ||
57 | *sp++ = 0; | ||
58 | *sp++ = 0; | ||
59 | *sp++ = 0; | ||
60 | |||
61 | __asm__ __volatile__("1:\t" | ||
62 | ".chip 68040\n\t" | ||
63 | "move16 %2@+,%0@+\n\t" | ||
64 | ".chip 68k\n\t" | ||
65 | "subqw #8,%2\n\t" | ||
66 | "subqw #8,%2\n\t" | ||
67 | "dbra %1,1b\n\t" | ||
68 | : "=a" (sp), "=d" (tmp) | ||
69 | : "a" (page), "0" (sp), | ||
70 | "1" ((PAGE_SIZE - 16) / 16 - 1)); | ||
71 | } | ||
72 | |||
73 | #else | ||
74 | #define clear_page(page) memset((page), 0, PAGE_SIZE) | ||
75 | #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) | ||
76 | #endif | ||
77 | |||
78 | #define clear_user_page(addr, vaddr, page) \ | ||
79 | do { clear_page(addr); \ | ||
80 | flush_dcache_page(page); \ | ||
81 | } while (0) | ||
82 | #define copy_user_page(to, from, vaddr, page) \ | ||
83 | do { copy_page(to, from); \ | ||
84 | flush_dcache_page(page); \ | ||
85 | } while (0) | ||
86 | |||
87 | /* | ||
88 | * These are used to make use of C type-checking.. | ||
89 | */ | ||
90 | typedef struct { unsigned long pte; } pte_t; | ||
91 | typedef struct { unsigned long pmd[16]; } pmd_t; | ||
92 | typedef struct { unsigned long pgd; } pgd_t; | ||
93 | typedef struct { unsigned long pgprot; } pgprot_t; | ||
94 | typedef struct page *pgtable_t; | ||
95 | |||
96 | #define pte_val(x) ((x).pte) | ||
97 | #define pmd_val(x) ((&x)->pmd[0]) | ||
98 | #define pgd_val(x) ((x).pgd) | ||
99 | #define pgprot_val(x) ((x).pgprot) | ||
100 | |||
101 | #define __pte(x) ((pte_t) { (x) } ) | ||
102 | #define __pmd(x) ((pmd_t) { (x) } ) | ||
103 | #define __pgd(x) ((pgd_t) { (x) } ) | ||
104 | #define __pgprot(x) ((pgprot_t) { (x) } ) | ||
105 | |||
106 | #endif /* !__ASSEMBLY__ */ | ||
107 | |||
108 | #include <asm/page_offset.h> | ||
109 | |||
110 | #define PAGE_OFFSET (PAGE_OFFSET_RAW) | ||
111 | |||
112 | #ifndef __ASSEMBLY__ | ||
113 | |||
114 | extern unsigned long m68k_memoffset; | ||
115 | |||
116 | #ifndef CONFIG_SUN3 | ||
117 | |||
118 | #define WANT_PAGE_VIRTUAL | ||
119 | |||
120 | static inline unsigned long ___pa(void *vaddr) | ||
121 | { | ||
122 | unsigned long paddr; | ||
123 | asm ( | ||
124 | "1: addl #0,%0\n" | ||
125 | m68k_fixup(%c2, 1b+2) | ||
126 | : "=r" (paddr) | ||
127 | : "0" (vaddr), "i" (m68k_fixup_memoffset)); | ||
128 | return paddr; | ||
129 | } | ||
130 | #define __pa(vaddr) ___pa((void *)(vaddr)) | ||
131 | static inline void *__va(unsigned long paddr) | ||
132 | { | ||
133 | void *vaddr; | ||
134 | asm ( | ||
135 | "1: subl #0,%0\n" | ||
136 | m68k_fixup(%c2, 1b+2) | ||
137 | : "=r" (vaddr) | ||
138 | : "0" (paddr), "i" (m68k_fixup_memoffset)); | ||
139 | return vaddr; | ||
140 | } | ||
141 | |||
142 | #else /* !CONFIG_SUN3 */ | ||
143 | /* This #define is a horrible hack to suppress lots of warnings. --m */ | ||
144 | #define __pa(x) ___pa((unsigned long)(x)) | ||
145 | static inline unsigned long ___pa(unsigned long x) | ||
146 | { | ||
147 | if(x == 0) | ||
148 | return 0; | ||
149 | if(x >= PAGE_OFFSET) | ||
150 | return (x-PAGE_OFFSET); | ||
151 | else | ||
152 | return (x+0x2000000); | ||
153 | } | ||
154 | |||
155 | static inline void *__va(unsigned long x) | ||
156 | { | ||
157 | if(x == 0) | ||
158 | return (void *)0; | ||
159 | |||
160 | if(x < 0x2000000) | ||
161 | return (void *)(x+PAGE_OFFSET); | ||
162 | else | ||
163 | return (void *)(x-0x2000000); | ||
164 | } | ||
165 | #endif /* CONFIG_SUN3 */ | ||
166 | |||
167 | /* | ||
168 | * NOTE: virtual isn't really correct, actually it should be the offset into the | ||
169 | * memory node, but we have no highmem, so that works for now. | ||
170 | * TODO: implement (fast) pfn<->pgdat_idx conversion functions, this makes lots | ||
171 | * of the shifts unnecessary. | ||
172 | */ | ||
173 | #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) | ||
174 | #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) | ||
175 | |||
176 | extern int m68k_virt_to_node_shift; | ||
177 | |||
178 | #ifdef CONFIG_SINGLE_MEMORY_CHUNK | ||
179 | #define __virt_to_node(addr) (&pg_data_map[0]) | ||
180 | #else | ||
181 | extern struct pglist_data *pg_data_table[]; | ||
182 | |||
183 | static inline __attribute_const__ int __virt_to_node_shift(void) | ||
184 | { | ||
185 | int shift; | ||
186 | |||
187 | asm ( | ||
188 | "1: moveq #0,%0\n" | ||
189 | m68k_fixup(%c1, 1b) | ||
190 | : "=d" (shift) | ||
191 | : "i" (m68k_fixup_vnode_shift)); | ||
192 | return shift; | ||
193 | } | ||
194 | |||
195 | #define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()]) | ||
196 | #endif | ||
197 | |||
198 | #define virt_to_page(addr) ({ \ | ||
199 | pfn_to_page(virt_to_pfn(addr)); \ | ||
200 | }) | ||
201 | #define page_to_virt(page) ({ \ | ||
202 | pfn_to_virt(page_to_pfn(page)); \ | ||
203 | }) | ||
204 | |||
205 | #define pfn_to_page(pfn) ({ \ | ||
206 | unsigned long __pfn = (pfn); \ | ||
207 | struct pglist_data *pgdat; \ | ||
208 | pgdat = __virt_to_node((unsigned long)pfn_to_virt(__pfn)); \ | ||
209 | pgdat->node_mem_map + (__pfn - pgdat->node_start_pfn); \ | ||
210 | }) | ||
211 | #define page_to_pfn(_page) ({ \ | ||
212 | struct page *__p = (_page); \ | ||
213 | struct pglist_data *pgdat; \ | ||
214 | pgdat = &pg_data_map[page_to_nid(__p)]; \ | ||
215 | ((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \ | ||
216 | }) | ||
217 | |||
218 | #define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory) | ||
219 | #define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn)) | ||
220 | |||
221 | #endif /* __ASSEMBLY__ */ | ||
222 | |||
223 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | ||
224 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | ||
225 | |||
226 | #include <asm-generic/page.h> | ||
227 | |||
228 | #endif /* _M68K_PAGE_H */ | ||
diff --git a/include/asm-m68k/page_offset.h b/include/asm-m68k/page_offset.h deleted file mode 100644 index 1cbdb7f30ac2..000000000000 --- a/include/asm-m68k/page_offset.h +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | |||
2 | /* This handles the memory map.. */ | ||
3 | #ifndef CONFIG_SUN3 | ||
4 | #define PAGE_OFFSET_RAW 0x00000000 | ||
5 | #else | ||
6 | #define PAGE_OFFSET_RAW 0x0E000000 | ||
7 | #endif | ||
8 | |||
diff --git a/include/asm-m68k/param.h b/include/asm-m68k/param.h deleted file mode 100644 index 536a27888358..000000000000 --- a/include/asm-m68k/param.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef _M68K_PARAM_H | ||
2 | #define _M68K_PARAM_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
6 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
7 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | ||
8 | #endif | ||
9 | |||
10 | #ifndef HZ | ||
11 | #define HZ 100 | ||
12 | #endif | ||
13 | |||
14 | #define EXEC_PAGESIZE 8192 | ||
15 | |||
16 | #ifndef NOGROUP | ||
17 | #define NOGROUP (-1) | ||
18 | #endif | ||
19 | |||
20 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
21 | |||
22 | #endif /* _M68K_PARAM_H */ | ||
diff --git a/include/asm-m68k/parport.h b/include/asm-m68k/parport.h deleted file mode 100644 index 646b1872f73b..000000000000 --- a/include/asm-m68k/parport.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | /* | ||
2 | * parport.h: platform-specific PC-style parport initialisation | ||
3 | * | ||
4 | * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk> | ||
5 | * | ||
6 | * This file should only be included by drivers/parport/parport_pc.c. | ||
7 | * | ||
8 | * RZ: for use with Q40 and other ISA machines | ||
9 | */ | ||
10 | |||
11 | #ifndef _ASM_M68K_PARPORT_H | ||
12 | #define _ASM_M68K_PARPORT_H 1 | ||
13 | |||
14 | #define insl(port,buf,len) isa_insb(port,buf,(len)<<2) | ||
15 | #define outsl(port,buf,len) isa_outsb(port,buf,(len)<<2) | ||
16 | |||
17 | /* no dma, or IRQ autoprobing */ | ||
18 | static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); | ||
19 | static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) | ||
20 | { | ||
21 | if (! (MACH_IS_Q40)) | ||
22 | return 0; /* count=0 */ | ||
23 | return parport_pc_find_isa_ports (PARPORT_IRQ_NONE, PARPORT_DMA_NONE); | ||
24 | } | ||
25 | |||
26 | #endif /* !(_ASM_M68K_PARPORT_H) */ | ||
diff --git a/include/asm-m68k/pci.h b/include/asm-m68k/pci.h deleted file mode 100644 index 4ad0aea48ab4..000000000000 --- a/include/asm-m68k/pci.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_PCI_H | ||
2 | #define _ASM_M68K_PCI_H | ||
3 | |||
4 | #include <asm-generic/pci-dma-compat.h> | ||
5 | |||
6 | /* The PCI address space does equal the physical memory | ||
7 | * address space. The networking and block device layers use | ||
8 | * this boolean for bounce buffer decisions. | ||
9 | */ | ||
10 | #define PCI_DMA_BUS_IS_PHYS (1) | ||
11 | |||
12 | #endif /* _ASM_M68K_PCI_H */ | ||
diff --git a/include/asm-m68k/percpu.h b/include/asm-m68k/percpu.h deleted file mode 100644 index 0859d048faf5..000000000000 --- a/include/asm-m68k/percpu.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __ASM_M68K_PERCPU_H | ||
2 | #define __ASM_M68K_PERCPU_H | ||
3 | |||
4 | #include <asm-generic/percpu.h> | ||
5 | |||
6 | #endif /* __ASM_M68K_PERCPU_H */ | ||
diff --git a/include/asm-m68k/pgalloc.h b/include/asm-m68k/pgalloc.h deleted file mode 100644 index 4cb1a57ab763..000000000000 --- a/include/asm-m68k/pgalloc.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | |||
2 | #ifndef M68K_PGALLOC_H | ||
3 | #define M68K_PGALLOC_H | ||
4 | |||
5 | #include <linux/mm.h> | ||
6 | #include <linux/highmem.h> | ||
7 | #include <asm/setup.h> | ||
8 | #include <asm/virtconvert.h> | ||
9 | |||
10 | |||
11 | #ifdef CONFIG_SUN3 | ||
12 | #include <asm/sun3_pgalloc.h> | ||
13 | #else | ||
14 | #include <asm/motorola_pgalloc.h> | ||
15 | #endif | ||
16 | |||
17 | extern void m68k_setup_node(int node); | ||
18 | |||
19 | #endif /* M68K_PGALLOC_H */ | ||
diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h deleted file mode 100644 index 0b604f0f192d..000000000000 --- a/include/asm-m68k/pgtable.h +++ /dev/null | |||
@@ -1,166 +0,0 @@ | |||
1 | #ifndef _M68K_PGTABLE_H | ||
2 | #define _M68K_PGTABLE_H | ||
3 | |||
4 | #include <asm-generic/4level-fixup.h> | ||
5 | |||
6 | #include <asm/setup.h> | ||
7 | |||
8 | #ifndef __ASSEMBLY__ | ||
9 | #include <asm/processor.h> | ||
10 | #include <linux/sched.h> | ||
11 | #include <linux/threads.h> | ||
12 | |||
13 | /* | ||
14 | * This file contains the functions and defines necessary to modify and use | ||
15 | * the m68k page table tree. | ||
16 | */ | ||
17 | |||
18 | #include <asm/virtconvert.h> | ||
19 | |||
20 | /* Certain architectures need to do special things when pte's | ||
21 | * within a page table are directly modified. Thus, the following | ||
22 | * hook is made available. | ||
23 | */ | ||
24 | #define set_pte(pteptr, pteval) \ | ||
25 | do{ \ | ||
26 | *(pteptr) = (pteval); \ | ||
27 | } while(0) | ||
28 | #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) | ||
29 | |||
30 | |||
31 | /* PMD_SHIFT determines the size of the area a second-level page table can map */ | ||
32 | #ifdef CONFIG_SUN3 | ||
33 | #define PMD_SHIFT 17 | ||
34 | #else | ||
35 | #define PMD_SHIFT 22 | ||
36 | #endif | ||
37 | #define PMD_SIZE (1UL << PMD_SHIFT) | ||
38 | #define PMD_MASK (~(PMD_SIZE-1)) | ||
39 | |||
40 | /* PGDIR_SHIFT determines what a third-level page table entry can map */ | ||
41 | #ifdef CONFIG_SUN3 | ||
42 | #define PGDIR_SHIFT 17 | ||
43 | #else | ||
44 | #define PGDIR_SHIFT 25 | ||
45 | #endif | ||
46 | #define PGDIR_SIZE (1UL << PGDIR_SHIFT) | ||
47 | #define PGDIR_MASK (~(PGDIR_SIZE-1)) | ||
48 | |||
49 | /* | ||
50 | * entries per page directory level: the m68k is configured as three-level, | ||
51 | * so we do have PMD level physically. | ||
52 | */ | ||
53 | #ifdef CONFIG_SUN3 | ||
54 | #define PTRS_PER_PTE 16 | ||
55 | #define PTRS_PER_PMD 1 | ||
56 | #define PTRS_PER_PGD 2048 | ||
57 | #else | ||
58 | #define PTRS_PER_PTE 1024 | ||
59 | #define PTRS_PER_PMD 8 | ||
60 | #define PTRS_PER_PGD 128 | ||
61 | #endif | ||
62 | #define USER_PTRS_PER_PGD (TASK_SIZE/PGDIR_SIZE) | ||
63 | #define FIRST_USER_ADDRESS 0 | ||
64 | |||
65 | /* Virtual address region for use by kernel_map() */ | ||
66 | #ifdef CONFIG_SUN3 | ||
67 | #define KMAP_START 0x0DC00000 | ||
68 | #define KMAP_END 0x0E000000 | ||
69 | #else | ||
70 | #define KMAP_START 0xd0000000 | ||
71 | #define KMAP_END 0xf0000000 | ||
72 | #endif | ||
73 | |||
74 | #ifndef CONFIG_SUN3 | ||
75 | /* Just any arbitrary offset to the start of the vmalloc VM area: the | ||
76 | * current 8MB value just means that there will be a 8MB "hole" after the | ||
77 | * physical memory until the kernel virtual memory starts. That means that | ||
78 | * any out-of-bounds memory accesses will hopefully be caught. | ||
79 | * The vmalloc() routines leaves a hole of 4kB between each vmalloced | ||
80 | * area for the same reason. ;) | ||
81 | */ | ||
82 | #define VMALLOC_OFFSET (8*1024*1024) | ||
83 | #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)) | ||
84 | #define VMALLOC_END KMAP_START | ||
85 | #else | ||
86 | extern unsigned long vmalloc_end; | ||
87 | #define VMALLOC_START 0x0f800000 | ||
88 | #define VMALLOC_END vmalloc_end | ||
89 | #endif /* CONFIG_SUN3 */ | ||
90 | |||
91 | /* zero page used for uninitialized stuff */ | ||
92 | extern void *empty_zero_page; | ||
93 | |||
94 | /* | ||
95 | * ZERO_PAGE is a global shared page that is always zero: used | ||
96 | * for zero-mapped memory areas etc.. | ||
97 | */ | ||
98 | #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) | ||
99 | |||
100 | /* number of bits that fit into a memory pointer */ | ||
101 | #define BITS_PER_PTR (8*sizeof(unsigned long)) | ||
102 | |||
103 | /* to align the pointer to a pointer address */ | ||
104 | #define PTR_MASK (~(sizeof(void*)-1)) | ||
105 | |||
106 | /* sizeof(void*)==1<<SIZEOF_PTR_LOG2 */ | ||
107 | /* 64-bit machines, beware! SRB. */ | ||
108 | #define SIZEOF_PTR_LOG2 2 | ||
109 | |||
110 | extern void kernel_set_cachemode(void *addr, unsigned long size, int cmode); | ||
111 | |||
112 | /* | ||
113 | * The m68k doesn't have any external MMU info: the kernel page | ||
114 | * tables contain all the necessary information. The Sun3 does, but | ||
115 | * they are updated on demand. | ||
116 | */ | ||
117 | static inline void update_mmu_cache(struct vm_area_struct *vma, | ||
118 | unsigned long address, pte_t pte) | ||
119 | { | ||
120 | } | ||
121 | |||
122 | #endif /* !__ASSEMBLY__ */ | ||
123 | |||
124 | #define kern_addr_valid(addr) (1) | ||
125 | |||
126 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
127 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
128 | |||
129 | /* MMU-specific headers */ | ||
130 | |||
131 | #ifdef CONFIG_SUN3 | ||
132 | #include <asm/sun3_pgtable.h> | ||
133 | #else | ||
134 | #include <asm/motorola_pgtable.h> | ||
135 | #endif | ||
136 | |||
137 | #ifndef __ASSEMBLY__ | ||
138 | #include <asm-generic/pgtable.h> | ||
139 | |||
140 | /* | ||
141 | * Macro to mark a page protection value as "uncacheable". | ||
142 | */ | ||
143 | #ifdef SUN3_PAGE_NOCACHE | ||
144 | # define __SUN3_PAGE_NOCACHE SUN3_PAGE_NOCACHE | ||
145 | #else | ||
146 | # define __SUN3_PAGE_NOCACHE 0 | ||
147 | #endif | ||
148 | #define pgprot_noncached(prot) \ | ||
149 | (MMU_IS_SUN3 \ | ||
150 | ? (__pgprot(pgprot_val(prot) | __SUN3_PAGE_NOCACHE)) \ | ||
151 | : ((MMU_IS_851 || MMU_IS_030) \ | ||
152 | ? (__pgprot(pgprot_val(prot) | _PAGE_NOCACHE030)) \ | ||
153 | : (MMU_IS_040 || MMU_IS_060) \ | ||
154 | ? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \ | ||
155 | : (prot))) | ||
156 | |||
157 | #endif /* !__ASSEMBLY__ */ | ||
158 | |||
159 | /* | ||
160 | * No page table caches to initialise | ||
161 | */ | ||
162 | #define pgtable_cache_init() do { } while (0) | ||
163 | |||
164 | #define check_pgt_cache() do { } while (0) | ||
165 | |||
166 | #endif /* _M68K_PGTABLE_H */ | ||
diff --git a/include/asm-m68k/poll.h b/include/asm-m68k/poll.h deleted file mode 100644 index f080fcdb61bf..000000000000 --- a/include/asm-m68k/poll.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #ifndef __m68k_POLL_H | ||
2 | #define __m68k_POLL_H | ||
3 | |||
4 | #define POLLWRNORM POLLOUT | ||
5 | #define POLLWRBAND 256 | ||
6 | |||
7 | #include <asm-generic/poll.h> | ||
8 | |||
9 | #endif | ||
diff --git a/include/asm-m68k/posix_types.h b/include/asm-m68k/posix_types.h deleted file mode 100644 index 63cdcc142d93..000000000000 --- a/include/asm-m68k/posix_types.h +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | #ifndef __ARCH_M68K_POSIX_TYPES_H | ||
2 | #define __ARCH_M68K_POSIX_TYPES_H | ||
3 | |||
4 | /* | ||
5 | * This file is generally used by user-level software, so you need to | ||
6 | * be a little careful about namespace pollution etc. Also, we cannot | ||
7 | * assume GCC is being used. | ||
8 | */ | ||
9 | |||
10 | typedef unsigned long __kernel_ino_t; | ||
11 | typedef unsigned short __kernel_mode_t; | ||
12 | typedef unsigned short __kernel_nlink_t; | ||
13 | typedef long __kernel_off_t; | ||
14 | typedef int __kernel_pid_t; | ||
15 | typedef unsigned short __kernel_ipc_pid_t; | ||
16 | typedef unsigned short __kernel_uid_t; | ||
17 | typedef unsigned short __kernel_gid_t; | ||
18 | typedef unsigned int __kernel_size_t; | ||
19 | typedef int __kernel_ssize_t; | ||
20 | typedef int __kernel_ptrdiff_t; | ||
21 | typedef long __kernel_time_t; | ||
22 | typedef long __kernel_suseconds_t; | ||
23 | typedef long __kernel_clock_t; | ||
24 | typedef int __kernel_timer_t; | ||
25 | typedef int __kernel_clockid_t; | ||
26 | typedef int __kernel_daddr_t; | ||
27 | typedef char * __kernel_caddr_t; | ||
28 | typedef unsigned short __kernel_uid16_t; | ||
29 | typedef unsigned short __kernel_gid16_t; | ||
30 | typedef unsigned int __kernel_uid32_t; | ||
31 | typedef unsigned int __kernel_gid32_t; | ||
32 | |||
33 | typedef unsigned short __kernel_old_uid_t; | ||
34 | typedef unsigned short __kernel_old_gid_t; | ||
35 | typedef unsigned short __kernel_old_dev_t; | ||
36 | |||
37 | #ifdef __GNUC__ | ||
38 | typedef long long __kernel_loff_t; | ||
39 | #endif | ||
40 | |||
41 | typedef struct { | ||
42 | int val[2]; | ||
43 | } __kernel_fsid_t; | ||
44 | |||
45 | #if defined(__KERNEL__) | ||
46 | |||
47 | #undef __FD_SET | ||
48 | #define __FD_SET(d, set) ((set)->fds_bits[__FDELT(d)] |= __FDMASK(d)) | ||
49 | |||
50 | #undef __FD_CLR | ||
51 | #define __FD_CLR(d, set) ((set)->fds_bits[__FDELT(d)] &= ~__FDMASK(d)) | ||
52 | |||
53 | #undef __FD_ISSET | ||
54 | #define __FD_ISSET(d, set) ((set)->fds_bits[__FDELT(d)] & __FDMASK(d)) | ||
55 | |||
56 | #undef __FD_ZERO | ||
57 | #define __FD_ZERO(fdsetp) (memset (fdsetp, 0, sizeof(*(fd_set *)fdsetp))) | ||
58 | |||
59 | #endif /* defined(__KERNEL__) */ | ||
60 | |||
61 | #endif | ||
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h deleted file mode 100644 index 1f61ef53f0e0..000000000000 --- a/include/asm-m68k/processor.h +++ /dev/null | |||
@@ -1,130 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-m68k/processor.h | ||
3 | * | ||
4 | * Copyright (C) 1995 Hamish Macdonald | ||
5 | */ | ||
6 | |||
7 | #ifndef __ASM_M68K_PROCESSOR_H | ||
8 | #define __ASM_M68K_PROCESSOR_H | ||
9 | |||
10 | /* | ||
11 | * Default implementation of macro that returns current | ||
12 | * instruction pointer ("program counter"). | ||
13 | */ | ||
14 | #define current_text_addr() ({ __label__ _l; _l: &&_l;}) | ||
15 | |||
16 | #include <linux/thread_info.h> | ||
17 | #include <asm/segment.h> | ||
18 | #include <asm/fpu.h> | ||
19 | #include <asm/ptrace.h> | ||
20 | |||
21 | static inline unsigned long rdusp(void) | ||
22 | { | ||
23 | unsigned long usp; | ||
24 | |||
25 | __asm__ __volatile__("move %/usp,%0" : "=a" (usp)); | ||
26 | return usp; | ||
27 | } | ||
28 | |||
29 | static inline void wrusp(unsigned long usp) | ||
30 | { | ||
31 | __asm__ __volatile__("move %0,%/usp" : : "a" (usp)); | ||
32 | } | ||
33 | |||
34 | /* | ||
35 | * User space process size: 3.75GB. This is hardcoded into a few places, | ||
36 | * so don't change it unless you know what you are doing. | ||
37 | */ | ||
38 | #ifndef CONFIG_SUN3 | ||
39 | #define TASK_SIZE (0xF0000000UL) | ||
40 | #else | ||
41 | #define TASK_SIZE (0x0E000000UL) | ||
42 | #endif | ||
43 | |||
44 | #ifdef __KERNEL__ | ||
45 | #define STACK_TOP TASK_SIZE | ||
46 | #define STACK_TOP_MAX STACK_TOP | ||
47 | #endif | ||
48 | |||
49 | /* This decides where the kernel will search for a free chunk of vm | ||
50 | * space during mmap's. | ||
51 | */ | ||
52 | #ifndef CONFIG_SUN3 | ||
53 | #define TASK_UNMAPPED_BASE 0xC0000000UL | ||
54 | #else | ||
55 | #define TASK_UNMAPPED_BASE 0x0A000000UL | ||
56 | #endif | ||
57 | #define TASK_UNMAPPED_ALIGN(addr, off) PAGE_ALIGN(addr) | ||
58 | |||
59 | struct thread_struct { | ||
60 | unsigned long ksp; /* kernel stack pointer */ | ||
61 | unsigned long usp; /* user stack pointer */ | ||
62 | unsigned short sr; /* saved status register */ | ||
63 | unsigned short fs; /* saved fs (sfc, dfc) */ | ||
64 | unsigned long crp[2]; /* cpu root pointer */ | ||
65 | unsigned long esp0; /* points to SR of stack frame */ | ||
66 | unsigned long faddr; /* info about last fault */ | ||
67 | int signo, code; | ||
68 | unsigned long fp[8*3]; | ||
69 | unsigned long fpcntl[3]; /* fp control regs */ | ||
70 | unsigned char fpstate[FPSTATESIZE]; /* floating point state */ | ||
71 | struct thread_info info; | ||
72 | }; | ||
73 | |||
74 | #define INIT_THREAD { \ | ||
75 | .ksp = sizeof(init_stack) + (unsigned long) init_stack, \ | ||
76 | .sr = PS_S, \ | ||
77 | .fs = __KERNEL_DS, \ | ||
78 | .info = INIT_THREAD_INFO(init_task), \ | ||
79 | } | ||
80 | |||
81 | /* | ||
82 | * Do necessary setup to start up a newly executed thread. | ||
83 | */ | ||
84 | static inline void start_thread(struct pt_regs * regs, unsigned long pc, | ||
85 | unsigned long usp) | ||
86 | { | ||
87 | /* reads from user space */ | ||
88 | set_fs(USER_DS); | ||
89 | |||
90 | regs->pc = pc; | ||
91 | regs->sr &= ~0x2000; | ||
92 | wrusp(usp); | ||
93 | } | ||
94 | |||
95 | /* Forward declaration, a strange C thing */ | ||
96 | struct task_struct; | ||
97 | |||
98 | /* Free all resources held by a thread. */ | ||
99 | static inline void release_thread(struct task_struct *dead_task) | ||
100 | { | ||
101 | } | ||
102 | |||
103 | /* Prepare to copy thread state - unlazy all lazy status */ | ||
104 | #define prepare_to_copy(tsk) do { } while (0) | ||
105 | |||
106 | extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags); | ||
107 | |||
108 | /* | ||
109 | * Free current thread data structures etc.. | ||
110 | */ | ||
111 | static inline void exit_thread(void) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | extern unsigned long thread_saved_pc(struct task_struct *tsk); | ||
116 | |||
117 | unsigned long get_wchan(struct task_struct *p); | ||
118 | |||
119 | #define KSTK_EIP(tsk) \ | ||
120 | ({ \ | ||
121 | unsigned long eip = 0; \ | ||
122 | if ((tsk)->thread.esp0 > PAGE_SIZE && \ | ||
123 | (virt_addr_valid((tsk)->thread.esp0))) \ | ||
124 | eip = ((struct pt_regs *) (tsk)->thread.esp0)->pc; \ | ||
125 | eip; }) | ||
126 | #define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) | ||
127 | |||
128 | #define cpu_relax() barrier() | ||
129 | |||
130 | #endif | ||
diff --git a/include/asm-m68k/ptrace.h b/include/asm-m68k/ptrace.h deleted file mode 100644 index 57e763d79bf4..000000000000 --- a/include/asm-m68k/ptrace.h +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | #ifndef _M68K_PTRACE_H | ||
2 | #define _M68K_PTRACE_H | ||
3 | |||
4 | #define PT_D1 0 | ||
5 | #define PT_D2 1 | ||
6 | #define PT_D3 2 | ||
7 | #define PT_D4 3 | ||
8 | #define PT_D5 4 | ||
9 | #define PT_D6 5 | ||
10 | #define PT_D7 6 | ||
11 | #define PT_A0 7 | ||
12 | #define PT_A1 8 | ||
13 | #define PT_A2 9 | ||
14 | #define PT_A3 10 | ||
15 | #define PT_A4 11 | ||
16 | #define PT_A5 12 | ||
17 | #define PT_A6 13 | ||
18 | #define PT_D0 14 | ||
19 | #define PT_USP 15 | ||
20 | #define PT_ORIG_D0 16 | ||
21 | #define PT_SR 17 | ||
22 | #define PT_PC 18 | ||
23 | |||
24 | #ifndef __ASSEMBLY__ | ||
25 | |||
26 | /* this struct defines the way the registers are stored on the | ||
27 | stack during a system call. */ | ||
28 | |||
29 | struct pt_regs { | ||
30 | long d1; | ||
31 | long d2; | ||
32 | long d3; | ||
33 | long d4; | ||
34 | long d5; | ||
35 | long a0; | ||
36 | long a1; | ||
37 | long a2; | ||
38 | long d0; | ||
39 | long orig_d0; | ||
40 | long stkadj; | ||
41 | unsigned short sr; | ||
42 | unsigned long pc; | ||
43 | unsigned format : 4; /* frame format specifier */ | ||
44 | unsigned vector : 12; /* vector offset */ | ||
45 | }; | ||
46 | |||
47 | /* | ||
48 | * This is the extended stack used by signal handlers and the context | ||
49 | * switcher: it's pushed after the normal "struct pt_regs". | ||
50 | */ | ||
51 | struct switch_stack { | ||
52 | unsigned long d6; | ||
53 | unsigned long d7; | ||
54 | unsigned long a3; | ||
55 | unsigned long a4; | ||
56 | unsigned long a5; | ||
57 | unsigned long a6; | ||
58 | unsigned long retpc; | ||
59 | }; | ||
60 | |||
61 | /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */ | ||
62 | #define PTRACE_GETREGS 12 | ||
63 | #define PTRACE_SETREGS 13 | ||
64 | #define PTRACE_GETFPREGS 14 | ||
65 | #define PTRACE_SETFPREGS 15 | ||
66 | |||
67 | #ifdef __KERNEL__ | ||
68 | |||
69 | #ifndef PS_S | ||
70 | #define PS_S (0x2000) | ||
71 | #define PS_M (0x1000) | ||
72 | #endif | ||
73 | |||
74 | #define user_mode(regs) (!((regs)->sr & PS_S)) | ||
75 | #define instruction_pointer(regs) ((regs)->pc) | ||
76 | #define profile_pc(regs) instruction_pointer(regs) | ||
77 | extern void show_regs(struct pt_regs *); | ||
78 | #endif /* __KERNEL__ */ | ||
79 | #endif /* __ASSEMBLY__ */ | ||
80 | #endif /* _M68K_PTRACE_H */ | ||
diff --git a/include/asm-m68k/q40_master.h b/include/asm-m68k/q40_master.h deleted file mode 100644 index 3907a09d4fca..000000000000 --- a/include/asm-m68k/q40_master.h +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | /* | ||
2 | * Q40 master Chip Control | ||
3 | * RTC stuff merged for compactnes.. | ||
4 | */ | ||
5 | |||
6 | #ifndef _Q40_MASTER_H | ||
7 | #define _Q40_MASTER_H | ||
8 | |||
9 | #include <asm/raw_io.h> | ||
10 | |||
11 | |||
12 | #define q40_master_addr 0xff000000 | ||
13 | |||
14 | #define IIRQ_REG 0x0 /* internal IRQ reg */ | ||
15 | #define EIRQ_REG 0x4 /* external ... */ | ||
16 | #define KEYCODE_REG 0x1c /* value of received scancode */ | ||
17 | #define DISPLAY_CONTROL_REG 0x18 | ||
18 | #define FRAME_CLEAR_REG 0x24 | ||
19 | #define LED_REG 0x30 | ||
20 | |||
21 | #define Q40_LED_ON() master_outb(1,LED_REG) | ||
22 | #define Q40_LED_OFF() master_outb(0,LED_REG) | ||
23 | |||
24 | #define INTERRUPT_REG IIRQ_REG /* "native" ints */ | ||
25 | #define KEY_IRQ_ENABLE_REG 0x08 /**/ | ||
26 | #define KEYBOARD_UNLOCK_REG 0x20 /* clear kb int */ | ||
27 | |||
28 | #define SAMPLE_ENABLE_REG 0x14 /* generate SAMPLE ints */ | ||
29 | #define SAMPLE_RATE_REG 0x2c | ||
30 | #define SAMPLE_CLEAR_REG 0x28 | ||
31 | #define SAMPLE_LOW 0x00 | ||
32 | #define SAMPLE_HIGH 0x01 | ||
33 | |||
34 | #define FRAME_RATE_REG 0x38 /* generate FRAME ints at 200 HZ rate */ | ||
35 | |||
36 | #if 0 | ||
37 | #define SER_ENABLE_REG 0x0c /* allow serial ints to be generated */ | ||
38 | #endif | ||
39 | #define EXT_ENABLE_REG 0x10 /* ... rest of the ISA ints ... */ | ||
40 | |||
41 | |||
42 | #define master_inb(_reg_) in_8((unsigned char *)q40_master_addr+_reg_) | ||
43 | #define master_outb(_b_,_reg_) out_8((unsigned char *)q40_master_addr+_reg_,_b_) | ||
44 | |||
45 | /* RTC defines */ | ||
46 | |||
47 | #define Q40_RTC_BASE (0xff021ffc) | ||
48 | |||
49 | #define Q40_RTC_YEAR (*(volatile unsigned char *)(Q40_RTC_BASE+0)) | ||
50 | #define Q40_RTC_MNTH (*(volatile unsigned char *)(Q40_RTC_BASE-4)) | ||
51 | #define Q40_RTC_DATE (*(volatile unsigned char *)(Q40_RTC_BASE-8)) | ||
52 | #define Q40_RTC_DOW (*(volatile unsigned char *)(Q40_RTC_BASE-12)) | ||
53 | #define Q40_RTC_HOUR (*(volatile unsigned char *)(Q40_RTC_BASE-16)) | ||
54 | #define Q40_RTC_MINS (*(volatile unsigned char *)(Q40_RTC_BASE-20)) | ||
55 | #define Q40_RTC_SECS (*(volatile unsigned char *)(Q40_RTC_BASE-24)) | ||
56 | #define Q40_RTC_CTRL (*(volatile unsigned char *)(Q40_RTC_BASE-28)) | ||
57 | |||
58 | /* some control bits */ | ||
59 | #define Q40_RTC_READ 64 /* prepare for reading */ | ||
60 | #define Q40_RTC_WRITE 128 | ||
61 | |||
62 | /* define some Q40 specific ints */ | ||
63 | #include "q40ints.h" | ||
64 | |||
65 | /* misc defs */ | ||
66 | #define DAC_LEFT ((unsigned char *)0xff008000) | ||
67 | #define DAC_RIGHT ((unsigned char *)0xff008004) | ||
68 | |||
69 | #endif /* _Q40_MASTER_H */ | ||
diff --git a/include/asm-m68k/q40ints.h b/include/asm-m68k/q40ints.h deleted file mode 100644 index 3d970afb708f..000000000000 --- a/include/asm-m68k/q40ints.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * contains some Q40 related interrupt definitions | ||
3 | */ | ||
4 | |||
5 | #define Q40_IRQ_MAX (34) | ||
6 | |||
7 | #define Q40_IRQ_SAMPLE (34) | ||
8 | #define Q40_IRQ_KEYBOARD (32) | ||
9 | #define Q40_IRQ_FRAME (33) | ||
10 | |||
11 | |||
12 | /* masks for interrupt regiosters*/ | ||
13 | /* internal, IIRQ_REG */ | ||
14 | #define Q40_IRQ_KEYB_MASK (2) | ||
15 | #define Q40_IRQ_SER_MASK (1<<2) | ||
16 | #define Q40_IRQ_FRAME_MASK (1<<3) | ||
17 | #define Q40_IRQ_EXT_MASK (1<<4) /* is a EIRQ */ | ||
18 | /* eirq, EIRQ_REG */ | ||
19 | #define Q40_IRQ3_MASK (1) | ||
20 | #define Q40_IRQ4_MASK (1<<1) | ||
21 | #define Q40_IRQ5_MASK (1<<2) | ||
22 | #define Q40_IRQ6_MASK (1<<3) | ||
23 | #define Q40_IRQ7_MASK (1<<4) | ||
24 | #define Q40_IRQ10_MASK (1<<5) | ||
25 | #define Q40_IRQ14_MASK (1<<6) | ||
26 | #define Q40_IRQ15_MASK (1<<7) | ||
27 | |||
28 | extern unsigned long q40_probe_irq_on (void); | ||
29 | extern int q40_probe_irq_off (unsigned long irqs); | ||
diff --git a/include/asm-m68k/raw_io.h b/include/asm-m68k/raw_io.h deleted file mode 100644 index d9eb9834ccc8..000000000000 --- a/include/asm-m68k/raw_io.h +++ /dev/null | |||
@@ -1,347 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-m68k/raw_io.h | ||
3 | * | ||
4 | * 10/20/00 RZ: - created from bits of io.h and ide.h to cleanup namespace | ||
5 | * | ||
6 | */ | ||
7 | |||
8 | #ifndef _RAW_IO_H | ||
9 | #define _RAW_IO_H | ||
10 | |||
11 | #ifdef __KERNEL__ | ||
12 | |||
13 | #include <asm/types.h> | ||
14 | |||
15 | |||
16 | /* Values for nocacheflag and cmode */ | ||
17 | #define IOMAP_FULL_CACHING 0 | ||
18 | #define IOMAP_NOCACHE_SER 1 | ||
19 | #define IOMAP_NOCACHE_NONSER 2 | ||
20 | #define IOMAP_WRITETHROUGH 3 | ||
21 | |||
22 | extern void iounmap(void __iomem *addr); | ||
23 | |||
24 | extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, | ||
25 | int cacheflag); | ||
26 | extern void __iounmap(void *addr, unsigned long size); | ||
27 | |||
28 | |||
29 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates | ||
30 | * two accesses to memory, which may be undesirable for some devices. | ||
31 | */ | ||
32 | #define in_8(addr) \ | ||
33 | ({ u8 __v = (*(__force volatile u8 *) (addr)); __v; }) | ||
34 | #define in_be16(addr) \ | ||
35 | ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; }) | ||
36 | #define in_be32(addr) \ | ||
37 | ({ u32 __v = (*(__force volatile u32 *) (addr)); __v; }) | ||
38 | #define in_le16(addr) \ | ||
39 | ({ u16 __v = le16_to_cpu(*(__force volatile __le16 *) (addr)); __v; }) | ||
40 | #define in_le32(addr) \ | ||
41 | ({ u32 __v = le32_to_cpu(*(__force volatile __le32 *) (addr)); __v; }) | ||
42 | |||
43 | #define out_8(addr,b) (void)((*(__force volatile u8 *) (addr)) = (b)) | ||
44 | #define out_be16(addr,w) (void)((*(__force volatile u16 *) (addr)) = (w)) | ||
45 | #define out_be32(addr,l) (void)((*(__force volatile u32 *) (addr)) = (l)) | ||
46 | #define out_le16(addr,w) (void)((*(__force volatile __le16 *) (addr)) = cpu_to_le16(w)) | ||
47 | #define out_le32(addr,l) (void)((*(__force volatile __le32 *) (addr)) = cpu_to_le32(l)) | ||
48 | |||
49 | #define raw_inb in_8 | ||
50 | #define raw_inw in_be16 | ||
51 | #define raw_inl in_be32 | ||
52 | #define __raw_readb in_8 | ||
53 | #define __raw_readw in_be16 | ||
54 | #define __raw_readl in_be32 | ||
55 | |||
56 | #define raw_outb(val,port) out_8((port),(val)) | ||
57 | #define raw_outw(val,port) out_be16((port),(val)) | ||
58 | #define raw_outl(val,port) out_be32((port),(val)) | ||
59 | #define __raw_writeb(val,addr) out_8((addr),(val)) | ||
60 | #define __raw_writew(val,addr) out_be16((addr),(val)) | ||
61 | #define __raw_writel(val,addr) out_be32((addr),(val)) | ||
62 | |||
63 | static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len) | ||
64 | { | ||
65 | unsigned int i; | ||
66 | |||
67 | for (i = 0; i < len; i++) | ||
68 | *buf++ = in_8(port); | ||
69 | } | ||
70 | |||
71 | static inline void raw_outsb(volatile u8 __iomem *port, const u8 *buf, | ||
72 | unsigned int len) | ||
73 | { | ||
74 | unsigned int i; | ||
75 | |||
76 | for (i = 0; i < len; i++) | ||
77 | out_8(port, *buf++); | ||
78 | } | ||
79 | |||
80 | static inline void raw_insw(volatile u16 __iomem *port, u16 *buf, unsigned int nr) | ||
81 | { | ||
82 | unsigned int tmp; | ||
83 | |||
84 | if (nr & 15) { | ||
85 | tmp = (nr & 15) - 1; | ||
86 | asm volatile ( | ||
87 | "1: movew %2@,%0@+; dbra %1,1b" | ||
88 | : "=a" (buf), "=d" (tmp) | ||
89 | : "a" (port), "0" (buf), | ||
90 | "1" (tmp)); | ||
91 | } | ||
92 | if (nr >> 4) { | ||
93 | tmp = (nr >> 4) - 1; | ||
94 | asm volatile ( | ||
95 | "1: " | ||
96 | "movew %2@,%0@+; " | ||
97 | "movew %2@,%0@+; " | ||
98 | "movew %2@,%0@+; " | ||
99 | "movew %2@,%0@+; " | ||
100 | "movew %2@,%0@+; " | ||
101 | "movew %2@,%0@+; " | ||
102 | "movew %2@,%0@+; " | ||
103 | "movew %2@,%0@+; " | ||
104 | "movew %2@,%0@+; " | ||
105 | "movew %2@,%0@+; " | ||
106 | "movew %2@,%0@+; " | ||
107 | "movew %2@,%0@+; " | ||
108 | "movew %2@,%0@+; " | ||
109 | "movew %2@,%0@+; " | ||
110 | "movew %2@,%0@+; " | ||
111 | "movew %2@,%0@+; " | ||
112 | "dbra %1,1b" | ||
113 | : "=a" (buf), "=d" (tmp) | ||
114 | : "a" (port), "0" (buf), | ||
115 | "1" (tmp)); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | static inline void raw_outsw(volatile u16 __iomem *port, const u16 *buf, | ||
120 | unsigned int nr) | ||
121 | { | ||
122 | unsigned int tmp; | ||
123 | |||
124 | if (nr & 15) { | ||
125 | tmp = (nr & 15) - 1; | ||
126 | asm volatile ( | ||
127 | "1: movew %0@+,%2@; dbra %1,1b" | ||
128 | : "=a" (buf), "=d" (tmp) | ||
129 | : "a" (port), "0" (buf), | ||
130 | "1" (tmp)); | ||
131 | } | ||
132 | if (nr >> 4) { | ||
133 | tmp = (nr >> 4) - 1; | ||
134 | asm volatile ( | ||
135 | "1: " | ||
136 | "movew %0@+,%2@; " | ||
137 | "movew %0@+,%2@; " | ||
138 | "movew %0@+,%2@; " | ||
139 | "movew %0@+,%2@; " | ||
140 | "movew %0@+,%2@; " | ||
141 | "movew %0@+,%2@; " | ||
142 | "movew %0@+,%2@; " | ||
143 | "movew %0@+,%2@; " | ||
144 | "movew %0@+,%2@; " | ||
145 | "movew %0@+,%2@; " | ||
146 | "movew %0@+,%2@; " | ||
147 | "movew %0@+,%2@; " | ||
148 | "movew %0@+,%2@; " | ||
149 | "movew %0@+,%2@; " | ||
150 | "movew %0@+,%2@; " | ||
151 | "movew %0@+,%2@; " | ||
152 | "dbra %1,1b" | ||
153 | : "=a" (buf), "=d" (tmp) | ||
154 | : "a" (port), "0" (buf), | ||
155 | "1" (tmp)); | ||
156 | } | ||
157 | } | ||
158 | |||
159 | static inline void raw_insl(volatile u32 __iomem *port, u32 *buf, unsigned int nr) | ||
160 | { | ||
161 | unsigned int tmp; | ||
162 | |||
163 | if (nr & 15) { | ||
164 | tmp = (nr & 15) - 1; | ||
165 | asm volatile ( | ||
166 | "1: movel %2@,%0@+; dbra %1,1b" | ||
167 | : "=a" (buf), "=d" (tmp) | ||
168 | : "a" (port), "0" (buf), | ||
169 | "1" (tmp)); | ||
170 | } | ||
171 | if (nr >> 4) { | ||
172 | tmp = (nr >> 4) - 1; | ||
173 | asm volatile ( | ||
174 | "1: " | ||
175 | "movel %2@,%0@+; " | ||
176 | "movel %2@,%0@+; " | ||
177 | "movel %2@,%0@+; " | ||
178 | "movel %2@,%0@+; " | ||
179 | "movel %2@,%0@+; " | ||
180 | "movel %2@,%0@+; " | ||
181 | "movel %2@,%0@+; " | ||
182 | "movel %2@,%0@+; " | ||
183 | "movel %2@,%0@+; " | ||
184 | "movel %2@,%0@+; " | ||
185 | "movel %2@,%0@+; " | ||
186 | "movel %2@,%0@+; " | ||
187 | "movel %2@,%0@+; " | ||
188 | "movel %2@,%0@+; " | ||
189 | "movel %2@,%0@+; " | ||
190 | "movel %2@,%0@+; " | ||
191 | "dbra %1,1b" | ||
192 | : "=a" (buf), "=d" (tmp) | ||
193 | : "a" (port), "0" (buf), | ||
194 | "1" (tmp)); | ||
195 | } | ||
196 | } | ||
197 | |||
198 | static inline void raw_outsl(volatile u32 __iomem *port, const u32 *buf, | ||
199 | unsigned int nr) | ||
200 | { | ||
201 | unsigned int tmp; | ||
202 | |||
203 | if (nr & 15) { | ||
204 | tmp = (nr & 15) - 1; | ||
205 | asm volatile ( | ||
206 | "1: movel %0@+,%2@; dbra %1,1b" | ||
207 | : "=a" (buf), "=d" (tmp) | ||
208 | : "a" (port), "0" (buf), | ||
209 | "1" (tmp)); | ||
210 | } | ||
211 | if (nr >> 4) { | ||
212 | tmp = (nr >> 4) - 1; | ||
213 | asm volatile ( | ||
214 | "1: " | ||
215 | "movel %0@+,%2@; " | ||
216 | "movel %0@+,%2@; " | ||
217 | "movel %0@+,%2@; " | ||
218 | "movel %0@+,%2@; " | ||
219 | "movel %0@+,%2@; " | ||
220 | "movel %0@+,%2@; " | ||
221 | "movel %0@+,%2@; " | ||
222 | "movel %0@+,%2@; " | ||
223 | "movel %0@+,%2@; " | ||
224 | "movel %0@+,%2@; " | ||
225 | "movel %0@+,%2@; " | ||
226 | "movel %0@+,%2@; " | ||
227 | "movel %0@+,%2@; " | ||
228 | "movel %0@+,%2@; " | ||
229 | "movel %0@+,%2@; " | ||
230 | "movel %0@+,%2@; " | ||
231 | "dbra %1,1b" | ||
232 | : "=a" (buf), "=d" (tmp) | ||
233 | : "a" (port), "0" (buf), | ||
234 | "1" (tmp)); | ||
235 | } | ||
236 | } | ||
237 | |||
238 | |||
239 | static inline void raw_insw_swapw(volatile u16 __iomem *port, u16 *buf, | ||
240 | unsigned int nr) | ||
241 | { | ||
242 | if ((nr) % 8) | ||
243 | __asm__ __volatile__ | ||
244 | ("\tmovel %0,%/a0\n\t" | ||
245 | "movel %1,%/a1\n\t" | ||
246 | "movel %2,%/d6\n\t" | ||
247 | "subql #1,%/d6\n" | ||
248 | "1:\tmovew %/a0@,%/d0\n\t" | ||
249 | "rolw #8,%/d0\n\t" | ||
250 | "movew %/d0,%/a1@+\n\t" | ||
251 | "dbra %/d6,1b" | ||
252 | : | ||
253 | : "g" (port), "g" (buf), "g" (nr) | ||
254 | : "d0", "a0", "a1", "d6"); | ||
255 | else | ||
256 | __asm__ __volatile__ | ||
257 | ("movel %0,%/a0\n\t" | ||
258 | "movel %1,%/a1\n\t" | ||
259 | "movel %2,%/d6\n\t" | ||
260 | "lsrl #3,%/d6\n\t" | ||
261 | "subql #1,%/d6\n" | ||
262 | "1:\tmovew %/a0@,%/d0\n\t" | ||
263 | "rolw #8,%/d0\n\t" | ||
264 | "movew %/d0,%/a1@+\n\t" | ||
265 | "movew %/a0@,%/d0\n\t" | ||
266 | "rolw #8,%/d0\n\t" | ||
267 | "movew %/d0,%/a1@+\n\t" | ||
268 | "movew %/a0@,%/d0\n\t" | ||
269 | "rolw #8,%/d0\n\t" | ||
270 | "movew %/d0,%/a1@+\n\t" | ||
271 | "movew %/a0@,%/d0\n\t" | ||
272 | "rolw #8,%/d0\n\t" | ||
273 | "movew %/d0,%/a1@+\n\t" | ||
274 | "movew %/a0@,%/d0\n\t" | ||
275 | "rolw #8,%/d0\n\t" | ||
276 | "movew %/d0,%/a1@+\n\t" | ||
277 | "movew %/a0@,%/d0\n\t" | ||
278 | "rolw #8,%/d0\n\t" | ||
279 | "movew %/d0,%/a1@+\n\t" | ||
280 | "movew %/a0@,%/d0\n\t" | ||
281 | "rolw #8,%/d0\n\t" | ||
282 | "movew %/d0,%/a1@+\n\t" | ||
283 | "movew %/a0@,%/d0\n\t" | ||
284 | "rolw #8,%/d0\n\t" | ||
285 | "movew %/d0,%/a1@+\n\t" | ||
286 | "dbra %/d6,1b" | ||
287 | : | ||
288 | : "g" (port), "g" (buf), "g" (nr) | ||
289 | : "d0", "a0", "a1", "d6"); | ||
290 | } | ||
291 | |||
292 | static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf, | ||
293 | unsigned int nr) | ||
294 | { | ||
295 | if ((nr) % 8) | ||
296 | __asm__ __volatile__ | ||
297 | ("movel %0,%/a0\n\t" | ||
298 | "movel %1,%/a1\n\t" | ||
299 | "movel %2,%/d6\n\t" | ||
300 | "subql #1,%/d6\n" | ||
301 | "1:\tmovew %/a1@+,%/d0\n\t" | ||
302 | "rolw #8,%/d0\n\t" | ||
303 | "movew %/d0,%/a0@\n\t" | ||
304 | "dbra %/d6,1b" | ||
305 | : | ||
306 | : "g" (port), "g" (buf), "g" (nr) | ||
307 | : "d0", "a0", "a1", "d6"); | ||
308 | else | ||
309 | __asm__ __volatile__ | ||
310 | ("movel %0,%/a0\n\t" | ||
311 | "movel %1,%/a1\n\t" | ||
312 | "movel %2,%/d6\n\t" | ||
313 | "lsrl #3,%/d6\n\t" | ||
314 | "subql #1,%/d6\n" | ||
315 | "1:\tmovew %/a1@+,%/d0\n\t" | ||
316 | "rolw #8,%/d0\n\t" | ||
317 | "movew %/d0,%/a0@\n\t" | ||
318 | "movew %/a1@+,%/d0\n\t" | ||
319 | "rolw #8,%/d0\n\t" | ||
320 | "movew %/d0,%/a0@\n\t" | ||
321 | "movew %/a1@+,%/d0\n\t" | ||
322 | "rolw #8,%/d0\n\t" | ||
323 | "movew %/d0,%/a0@\n\t" | ||
324 | "movew %/a1@+,%/d0\n\t" | ||
325 | "rolw #8,%/d0\n\t" | ||
326 | "movew %/d0,%/a0@\n\t" | ||
327 | "movew %/a1@+,%/d0\n\t" | ||
328 | "rolw #8,%/d0\n\t" | ||
329 | "movew %/d0,%/a0@\n\t" | ||
330 | "movew %/a1@+,%/d0\n\t" | ||
331 | "rolw #8,%/d0\n\t" | ||
332 | "movew %/d0,%/a0@\n\t" | ||
333 | "movew %/a1@+,%/d0\n\t" | ||
334 | "rolw #8,%/d0\n\t" | ||
335 | "movew %/d0,%/a0@\n\t" | ||
336 | "movew %/a1@+,%/d0\n\t" | ||
337 | "rolw #8,%/d0\n\t" | ||
338 | "movew %/d0,%/a0@\n\t" | ||
339 | "dbra %/d6,1b" | ||
340 | : | ||
341 | : "g" (port), "g" (buf), "g" (nr) | ||
342 | : "d0", "a0", "a1", "d6"); | ||
343 | } | ||
344 | |||
345 | #endif /* __KERNEL__ */ | ||
346 | |||
347 | #endif /* _RAW_IO_H */ | ||
diff --git a/include/asm-m68k/resource.h b/include/asm-m68k/resource.h deleted file mode 100644 index e7d35019f337..000000000000 --- a/include/asm-m68k/resource.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_RESOURCE_H | ||
2 | #define _M68K_RESOURCE_H | ||
3 | |||
4 | #include <asm-generic/resource.h> | ||
5 | |||
6 | #endif /* _M68K_RESOURCE_H */ | ||
diff --git a/include/asm-m68k/rtc.h b/include/asm-m68k/rtc.h deleted file mode 100644 index 5d3e03859844..000000000000 --- a/include/asm-m68k/rtc.h +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | /* include/asm-m68k/rtc.h | ||
2 | * | ||
3 | * Copyright Richard Zidlicky | ||
4 | * implementation details for genrtc/q40rtc driver | ||
5 | */ | ||
6 | /* permission is hereby granted to copy, modify and redistribute this code | ||
7 | * in terms of the GNU Library General Public License, Version 2 or later, | ||
8 | * at your option. | ||
9 | */ | ||
10 | |||
11 | #ifndef _ASM_RTC_H | ||
12 | #define _ASM_RTC_H | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | |||
16 | #include <linux/rtc.h> | ||
17 | #include <asm/errno.h> | ||
18 | #include <asm/machdep.h> | ||
19 | |||
20 | #define RTC_PIE 0x40 /* periodic interrupt enable */ | ||
21 | #define RTC_AIE 0x20 /* alarm interrupt enable */ | ||
22 | #define RTC_UIE 0x10 /* update-finished interrupt enable */ | ||
23 | |||
24 | /* some dummy definitions */ | ||
25 | #define RTC_BATT_BAD 0x100 /* battery bad */ | ||
26 | #define RTC_SQWE 0x08 /* enable square-wave output */ | ||
27 | #define RTC_DM_BINARY 0x04 /* all time/date values are BCD if clear */ | ||
28 | #define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ | ||
29 | #define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ | ||
30 | |||
31 | static inline unsigned int get_rtc_time(struct rtc_time *time) | ||
32 | { | ||
33 | /* | ||
34 | * Only the values that we read from the RTC are set. We leave | ||
35 | * tm_wday, tm_yday and tm_isdst untouched. Even though the | ||
36 | * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated | ||
37 | * by the RTC when initially set to a non-zero value. | ||
38 | */ | ||
39 | mach_hwclk(0, time); | ||
40 | return RTC_24H; | ||
41 | } | ||
42 | |||
43 | static inline int set_rtc_time(struct rtc_time *time) | ||
44 | { | ||
45 | return mach_hwclk(1, time); | ||
46 | } | ||
47 | |||
48 | static inline unsigned int get_rtc_ss(void) | ||
49 | { | ||
50 | if (mach_get_ss) | ||
51 | return mach_get_ss(); | ||
52 | else{ | ||
53 | struct rtc_time h; | ||
54 | |||
55 | get_rtc_time(&h); | ||
56 | return h.tm_sec; | ||
57 | } | ||
58 | } | ||
59 | |||
60 | static inline int get_rtc_pll(struct rtc_pll_info *pll) | ||
61 | { | ||
62 | if (mach_get_rtc_pll) | ||
63 | return mach_get_rtc_pll(pll); | ||
64 | else | ||
65 | return -EINVAL; | ||
66 | } | ||
67 | static inline int set_rtc_pll(struct rtc_pll_info *pll) | ||
68 | { | ||
69 | if (mach_set_rtc_pll) | ||
70 | return mach_set_rtc_pll(pll); | ||
71 | else | ||
72 | return -EINVAL; | ||
73 | } | ||
74 | #endif /* __KERNEL__ */ | ||
75 | |||
76 | #endif /* _ASM__RTC_H */ | ||
diff --git a/include/asm-m68k/sbus.h b/include/asm-m68k/sbus.h deleted file mode 100644 index bfe3ba147f2e..000000000000 --- a/include/asm-m68k/sbus.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* | ||
2 | * some sbus structures and macros to make usage of sbus drivers possible | ||
3 | */ | ||
4 | |||
5 | #ifndef __M68K_SBUS_H | ||
6 | #define __M68K_SBUS_H | ||
7 | |||
8 | struct sbus_dev { | ||
9 | struct { | ||
10 | unsigned int which_io; | ||
11 | unsigned int phys_addr; | ||
12 | } reg_addrs[1]; | ||
13 | }; | ||
14 | |||
15 | /* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */ | ||
16 | /* No SBUS on the Sun3, kludge -- sam */ | ||
17 | |||
18 | static inline void _sbus_writeb(unsigned char val, unsigned long addr) | ||
19 | { | ||
20 | *(volatile unsigned char *)addr = val; | ||
21 | } | ||
22 | |||
23 | static inline unsigned char _sbus_readb(unsigned long addr) | ||
24 | { | ||
25 | return *(volatile unsigned char *)addr; | ||
26 | } | ||
27 | |||
28 | static inline void _sbus_writel(unsigned long val, unsigned long addr) | ||
29 | { | ||
30 | *(volatile unsigned long *)addr = val; | ||
31 | |||
32 | } | ||
33 | |||
34 | extern inline unsigned long _sbus_readl(unsigned long addr) | ||
35 | { | ||
36 | return *(volatile unsigned long *)addr; | ||
37 | } | ||
38 | |||
39 | |||
40 | #define sbus_readb(a) _sbus_readb((unsigned long)a) | ||
41 | #define sbus_writeb(v, a) _sbus_writeb(v, (unsigned long)a) | ||
42 | #define sbus_readl(a) _sbus_readl((unsigned long)a) | ||
43 | #define sbus_writel(v, a) _sbus_writel(v, (unsigned long)a) | ||
44 | |||
45 | #endif | ||
diff --git a/include/asm-m68k/scatterlist.h b/include/asm-m68k/scatterlist.h deleted file mode 100644 index d3a7a0edfeca..000000000000 --- a/include/asm-m68k/scatterlist.h +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | #ifndef _M68K_SCATTERLIST_H | ||
2 | #define _M68K_SCATTERLIST_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | struct scatterlist { | ||
7 | #ifdef CONFIG_DEBUG_SG | ||
8 | unsigned long sg_magic; | ||
9 | #endif | ||
10 | unsigned long page_link; | ||
11 | unsigned int offset; | ||
12 | unsigned int length; | ||
13 | |||
14 | __u32 dma_address; /* A place to hang host-specific addresses at. */ | ||
15 | }; | ||
16 | |||
17 | /* This is bogus and should go away. */ | ||
18 | #define ISA_DMA_THRESHOLD (0x00ffffff) | ||
19 | |||
20 | #define sg_dma_address(sg) ((sg)->dma_address) | ||
21 | #define sg_dma_len(sg) ((sg)->length) | ||
22 | |||
23 | #endif /* !(_M68K_SCATTERLIST_H) */ | ||
diff --git a/include/asm-m68k/sections.h b/include/asm-m68k/sections.h deleted file mode 100644 index d64967ecfec6..000000000000 --- a/include/asm-m68k/sections.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_SECTIONS_H | ||
2 | #define _ASM_M68K_SECTIONS_H | ||
3 | |||
4 | #include <asm-generic/sections.h> | ||
5 | |||
6 | #endif /* _ASM_M68K_SECTIONS_H */ | ||
diff --git a/include/asm-m68k/segment.h b/include/asm-m68k/segment.h deleted file mode 100644 index 7b0b2d3127f9..000000000000 --- a/include/asm-m68k/segment.h +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | #ifndef _M68K_SEGMENT_H | ||
2 | #define _M68K_SEGMENT_H | ||
3 | |||
4 | /* define constants */ | ||
5 | /* Address spaces (FC0-FC2) */ | ||
6 | #define USER_DATA (1) | ||
7 | #ifndef __USER_DS | ||
8 | #define __USER_DS (USER_DATA) | ||
9 | #endif | ||
10 | #define USER_PROGRAM (2) | ||
11 | #define SUPER_DATA (5) | ||
12 | #ifndef __KERNEL_DS | ||
13 | #define __KERNEL_DS (SUPER_DATA) | ||
14 | #endif | ||
15 | #define SUPER_PROGRAM (6) | ||
16 | #define CPU_SPACE (7) | ||
17 | |||
18 | #ifndef __ASSEMBLY__ | ||
19 | |||
20 | typedef struct { | ||
21 | unsigned long seg; | ||
22 | } mm_segment_t; | ||
23 | |||
24 | #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) | ||
25 | #define USER_DS MAKE_MM_SEG(__USER_DS) | ||
26 | #define KERNEL_DS MAKE_MM_SEG(__KERNEL_DS) | ||
27 | |||
28 | /* | ||
29 | * Get/set the SFC/DFC registers for MOVES instructions | ||
30 | */ | ||
31 | |||
32 | static inline mm_segment_t get_fs(void) | ||
33 | { | ||
34 | mm_segment_t _v; | ||
35 | __asm__ ("movec %/dfc,%0":"=r" (_v.seg):); | ||
36 | |||
37 | return _v; | ||
38 | } | ||
39 | |||
40 | static inline mm_segment_t get_ds(void) | ||
41 | { | ||
42 | /* return the supervisor data space code */ | ||
43 | return KERNEL_DS; | ||
44 | } | ||
45 | |||
46 | static inline void set_fs(mm_segment_t val) | ||
47 | { | ||
48 | __asm__ __volatile__ ("movec %0,%/sfc\n\t" | ||
49 | "movec %0,%/dfc\n\t" | ||
50 | : /* no outputs */ : "r" (val.seg) : "memory"); | ||
51 | } | ||
52 | |||
53 | #define segment_eq(a,b) ((a).seg == (b).seg) | ||
54 | |||
55 | #endif /* __ASSEMBLY__ */ | ||
56 | |||
57 | #endif /* _M68K_SEGMENT_H */ | ||
diff --git a/include/asm-m68k/sembuf.h b/include/asm-m68k/sembuf.h deleted file mode 100644 index 2308052a8c24..000000000000 --- a/include/asm-m68k/sembuf.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | #ifndef _M68K_SEMBUF_H | ||
2 | #define _M68K_SEMBUF_H | ||
3 | |||
4 | /* | ||
5 | * The semid64_ds structure for m68k 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 | |||
14 | struct semid64_ds { | ||
15 | struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ | ||
16 | __kernel_time_t sem_otime; /* last semop time */ | ||
17 | unsigned long __unused1; | ||
18 | __kernel_time_t sem_ctime; /* last change time */ | ||
19 | unsigned long __unused2; | ||
20 | unsigned long sem_nsems; /* no. of semaphores in array */ | ||
21 | unsigned long __unused3; | ||
22 | unsigned long __unused4; | ||
23 | }; | ||
24 | |||
25 | #endif /* _M68K_SEMBUF_H */ | ||
diff --git a/include/asm-m68k/serial.h b/include/asm-m68k/serial.h deleted file mode 100644 index 2b90d6e69070..000000000000 --- a/include/asm-m68k/serial.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-m68k/serial.h | ||
3 | * | ||
4 | * currently this seems useful only for a Q40, | ||
5 | * it's an almost exact copy of ../asm-alpha/serial.h | ||
6 | * | ||
7 | */ | ||
8 | |||
9 | |||
10 | /* | ||
11 | * This assumes you have a 1.8432 MHz clock for your UART. | ||
12 | * | ||
13 | * It'd be nice if someone built a serial card with a 24.576 MHz | ||
14 | * clock, since the 16550A is capable of handling a top speed of 1.5 | ||
15 | * megabits/second; but this requires the faster clock. | ||
16 | */ | ||
17 | #define BASE_BAUD ( 1843200 / 16 ) | ||
18 | |||
19 | /* Standard COM flags (except for COM4, because of the 8514 problem) */ | ||
20 | #ifdef CONFIG_SERIAL_DETECT_IRQ | ||
21 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) | ||
22 | #define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) | ||
23 | #else | ||
24 | #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) | ||
25 | #define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF | ||
26 | #endif | ||
27 | |||
28 | #define SERIAL_PORT_DFNS \ | ||
29 | /* UART CLK PORT IRQ FLAGS */ \ | ||
30 | { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ | ||
31 | { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ | ||
32 | { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ | ||
33 | { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ | ||
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h deleted file mode 100644 index 4dfb3952b375..000000000000 --- a/include/asm-m68k/setup.h +++ /dev/null | |||
@@ -1,376 +0,0 @@ | |||
1 | /* | ||
2 | ** asm/setup.h -- Definition of the Linux/m68k setup information | ||
3 | ** | ||
4 | ** Copyright 1992 by Greg Harp | ||
5 | ** | ||
6 | ** This file is subject to the terms and conditions of the GNU General Public | ||
7 | ** License. See the file COPYING in the main directory of this archive | ||
8 | ** for more details. | ||
9 | ** | ||
10 | ** Created 09/29/92 by Greg Harp | ||
11 | ** | ||
12 | ** 5/2/94 Roman Hodek: | ||
13 | ** Added bi_atari part of the machine dependent union bi_un; for now it | ||
14 | ** contains just a model field to distinguish between TT and Falcon. | ||
15 | ** 26/7/96 Roman Zippel: | ||
16 | ** Renamed to setup.h; added some useful macros to allow gcc some | ||
17 | ** optimizations if possible. | ||
18 | ** 5/10/96 Geert Uytterhoeven: | ||
19 | ** Redesign of the boot information structure; moved boot information | ||
20 | ** structure to bootinfo.h | ||
21 | */ | ||
22 | |||
23 | #ifndef _M68K_SETUP_H | ||
24 | #define _M68K_SETUP_H | ||
25 | |||
26 | |||
27 | |||
28 | /* | ||
29 | * Linux/m68k Architectures | ||
30 | */ | ||
31 | |||
32 | #define MACH_AMIGA 1 | ||
33 | #define MACH_ATARI 2 | ||
34 | #define MACH_MAC 3 | ||
35 | #define MACH_APOLLO 4 | ||
36 | #define MACH_SUN3 5 | ||
37 | #define MACH_MVME147 6 | ||
38 | #define MACH_MVME16x 7 | ||
39 | #define MACH_BVME6000 8 | ||
40 | #define MACH_HP300 9 | ||
41 | #define MACH_Q40 10 | ||
42 | #define MACH_SUN3X 11 | ||
43 | |||
44 | #define COMMAND_LINE_SIZE 256 | ||
45 | |||
46 | #ifdef __KERNEL__ | ||
47 | |||
48 | #define CL_SIZE COMMAND_LINE_SIZE | ||
49 | |||
50 | #ifndef __ASSEMBLY__ | ||
51 | extern unsigned long m68k_machtype; | ||
52 | #endif /* !__ASSEMBLY__ */ | ||
53 | |||
54 | #if !defined(CONFIG_AMIGA) | ||
55 | # define MACH_IS_AMIGA (0) | ||
56 | #elif defined(CONFIG_ATARI) || defined(CONFIG_MAC) || defined(CONFIG_APOLLO) \ | ||
57 | || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ | ||
58 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
59 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
60 | # define MACH_IS_AMIGA (m68k_machtype == MACH_AMIGA) | ||
61 | #else | ||
62 | # define MACH_AMIGA_ONLY | ||
63 | # define MACH_IS_AMIGA (1) | ||
64 | # define MACH_TYPE (MACH_AMIGA) | ||
65 | #endif | ||
66 | |||
67 | #if !defined(CONFIG_ATARI) | ||
68 | # define MACH_IS_ATARI (0) | ||
69 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_APOLLO) \ | ||
70 | || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ | ||
71 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
72 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
73 | # define MACH_IS_ATARI (m68k_machtype == MACH_ATARI) | ||
74 | #else | ||
75 | # define MACH_ATARI_ONLY | ||
76 | # define MACH_IS_ATARI (1) | ||
77 | # define MACH_TYPE (MACH_ATARI) | ||
78 | #endif | ||
79 | |||
80 | #if !defined(CONFIG_MAC) | ||
81 | # define MACH_IS_MAC (0) | ||
82 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_ATARI) || defined(CONFIG_APOLLO) \ | ||
83 | || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ | ||
84 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
85 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
86 | # define MACH_IS_MAC (m68k_machtype == MACH_MAC) | ||
87 | #else | ||
88 | # define MACH_MAC_ONLY | ||
89 | # define MACH_IS_MAC (1) | ||
90 | # define MACH_TYPE (MACH_MAC) | ||
91 | #endif | ||
92 | |||
93 | #if defined(CONFIG_SUN3) | ||
94 | #define MACH_IS_SUN3 (1) | ||
95 | #define MACH_SUN3_ONLY (1) | ||
96 | #define MACH_TYPE (MACH_SUN3) | ||
97 | #else | ||
98 | #define MACH_IS_SUN3 (0) | ||
99 | #endif | ||
100 | |||
101 | #if !defined (CONFIG_APOLLO) | ||
102 | # define MACH_IS_APOLLO (0) | ||
103 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
104 | || defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000) \ | ||
105 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
106 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
107 | # define MACH_IS_APOLLO (m68k_machtype == MACH_APOLLO) | ||
108 | #else | ||
109 | # define MACH_APOLLO_ONLY | ||
110 | # define MACH_IS_APOLLO (1) | ||
111 | # define MACH_TYPE (MACH_APOLLO) | ||
112 | #endif | ||
113 | |||
114 | #if !defined (CONFIG_MVME147) | ||
115 | # define MACH_IS_MVME147 (0) | ||
116 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
117 | || defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000) \ | ||
118 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
119 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME16x) | ||
120 | # define MACH_IS_MVME147 (m68k_machtype == MACH_MVME147) | ||
121 | #else | ||
122 | # define MACH_MVME147_ONLY | ||
123 | # define MACH_IS_MVME147 (1) | ||
124 | # define MACH_TYPE (MACH_MVME147) | ||
125 | #endif | ||
126 | |||
127 | #if !defined (CONFIG_MVME16x) | ||
128 | # define MACH_IS_MVME16x (0) | ||
129 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
130 | || defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000) \ | ||
131 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
132 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
133 | # define MACH_IS_MVME16x (m68k_machtype == MACH_MVME16x) | ||
134 | #else | ||
135 | # define MACH_MVME16x_ONLY | ||
136 | # define MACH_IS_MVME16x (1) | ||
137 | # define MACH_TYPE (MACH_MVME16x) | ||
138 | #endif | ||
139 | |||
140 | #if !defined (CONFIG_BVME6000) | ||
141 | # define MACH_IS_BVME6000 (0) | ||
142 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
143 | || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ | ||
144 | || defined(CONFIG_HP300) || defined(CONFIG_Q40) \ | ||
145 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
146 | # define MACH_IS_BVME6000 (m68k_machtype == MACH_BVME6000) | ||
147 | #else | ||
148 | # define MACH_BVME6000_ONLY | ||
149 | # define MACH_IS_BVME6000 (1) | ||
150 | # define MACH_TYPE (MACH_BVME6000) | ||
151 | #endif | ||
152 | |||
153 | #if !defined (CONFIG_HP300) | ||
154 | # define MACH_IS_HP300 (0) | ||
155 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
156 | || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ | ||
157 | || defined(CONFIG_BVME6000) || defined(CONFIG_Q40) \ | ||
158 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
159 | # define MACH_IS_HP300 (m68k_machtype == MACH_HP300) | ||
160 | #else | ||
161 | # define MACH_HP300_ONLY | ||
162 | # define MACH_IS_HP300 (1) | ||
163 | # define MACH_TYPE (MACH_HP300) | ||
164 | #endif | ||
165 | |||
166 | #if !defined (CONFIG_Q40) | ||
167 | # define MACH_IS_Q40 (0) | ||
168 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
169 | || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ | ||
170 | || defined(CONFIG_BVME6000) || defined(CONFIG_HP300) \ | ||
171 | || defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) | ||
172 | # define MACH_IS_Q40 (m68k_machtype == MACH_Q40) | ||
173 | #else | ||
174 | # define MACH_Q40_ONLY | ||
175 | # define MACH_IS_Q40 (1) | ||
176 | # define MACH_TYPE (MACH_Q40) | ||
177 | #endif | ||
178 | |||
179 | #if !defined (CONFIG_SUN3X) | ||
180 | # define MACH_IS_SUN3X (0) | ||
181 | #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \ | ||
182 | || defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \ | ||
183 | || defined(CONFIG_BVME6000) || defined(CONFIG_HP300) \ | ||
184 | || defined(CONFIG_Q40) || defined(CONFIG_MVME147) | ||
185 | # define MACH_IS_SUN3X (m68k_machtype == MACH_SUN3X) | ||
186 | #else | ||
187 | # define CONFIG_SUN3X_ONLY | ||
188 | # define MACH_IS_SUN3X (1) | ||
189 | # define MACH_TYPE (MACH_SUN3X) | ||
190 | #endif | ||
191 | |||
192 | #ifndef MACH_TYPE | ||
193 | # define MACH_TYPE (m68k_machtype) | ||
194 | #endif | ||
195 | |||
196 | #endif /* __KERNEL__ */ | ||
197 | |||
198 | |||
199 | /* | ||
200 | * CPU, FPU and MMU types | ||
201 | * | ||
202 | * Note: we may rely on the following equalities: | ||
203 | * | ||
204 | * CPU_68020 == MMU_68851 | ||
205 | * CPU_68030 == MMU_68030 | ||
206 | * CPU_68040 == FPU_68040 == MMU_68040 | ||
207 | * CPU_68060 == FPU_68060 == MMU_68060 | ||
208 | */ | ||
209 | |||
210 | #define CPUB_68020 0 | ||
211 | #define CPUB_68030 1 | ||
212 | #define CPUB_68040 2 | ||
213 | #define CPUB_68060 3 | ||
214 | |||
215 | #define CPU_68020 (1<<CPUB_68020) | ||
216 | #define CPU_68030 (1<<CPUB_68030) | ||
217 | #define CPU_68040 (1<<CPUB_68040) | ||
218 | #define CPU_68060 (1<<CPUB_68060) | ||
219 | |||
220 | #define FPUB_68881 0 | ||
221 | #define FPUB_68882 1 | ||
222 | #define FPUB_68040 2 /* Internal FPU */ | ||
223 | #define FPUB_68060 3 /* Internal FPU */ | ||
224 | #define FPUB_SUNFPA 4 /* Sun-3 FPA */ | ||
225 | |||
226 | #define FPU_68881 (1<<FPUB_68881) | ||
227 | #define FPU_68882 (1<<FPUB_68882) | ||
228 | #define FPU_68040 (1<<FPUB_68040) | ||
229 | #define FPU_68060 (1<<FPUB_68060) | ||
230 | #define FPU_SUNFPA (1<<FPUB_SUNFPA) | ||
231 | |||
232 | #define MMUB_68851 0 | ||
233 | #define MMUB_68030 1 /* Internal MMU */ | ||
234 | #define MMUB_68040 2 /* Internal MMU */ | ||
235 | #define MMUB_68060 3 /* Internal MMU */ | ||
236 | #define MMUB_APOLLO 4 /* Custom Apollo */ | ||
237 | #define MMUB_SUN3 5 /* Custom Sun-3 */ | ||
238 | |||
239 | #define MMU_68851 (1<<MMUB_68851) | ||
240 | #define MMU_68030 (1<<MMUB_68030) | ||
241 | #define MMU_68040 (1<<MMUB_68040) | ||
242 | #define MMU_68060 (1<<MMUB_68060) | ||
243 | #define MMU_SUN3 (1<<MMUB_SUN3) | ||
244 | #define MMU_APOLLO (1<<MMUB_APOLLO) | ||
245 | |||
246 | #ifdef __KERNEL__ | ||
247 | |||
248 | #ifndef __ASSEMBLY__ | ||
249 | extern unsigned long m68k_cputype; | ||
250 | extern unsigned long m68k_fputype; | ||
251 | extern unsigned long m68k_mmutype; | ||
252 | #ifdef CONFIG_VME | ||
253 | extern unsigned long vme_brdtype; | ||
254 | #endif | ||
255 | |||
256 | /* | ||
257 | * m68k_is040or060 is != 0 for a '040 or higher; | ||
258 | * used numbers are 4 for 68040 and 6 for 68060. | ||
259 | */ | ||
260 | |||
261 | extern int m68k_is040or060; | ||
262 | #endif /* !__ASSEMBLY__ */ | ||
263 | |||
264 | #if !defined(CONFIG_M68020) | ||
265 | # define CPU_IS_020 (0) | ||
266 | # define MMU_IS_851 (0) | ||
267 | # define MMU_IS_SUN3 (0) | ||
268 | #elif defined(CONFIG_M68030) || defined(CONFIG_M68040) || defined(CONFIG_M68060) | ||
269 | # define CPU_IS_020 (m68k_cputype & CPU_68020) | ||
270 | # define MMU_IS_851 (m68k_mmutype & MMU_68851) | ||
271 | # define MMU_IS_SUN3 (0) /* Sun3 not supported with other CPU enabled */ | ||
272 | #else | ||
273 | # define CPU_M68020_ONLY | ||
274 | # define CPU_IS_020 (1) | ||
275 | #ifdef MACH_SUN3_ONLY | ||
276 | # define MMU_IS_SUN3 (1) | ||
277 | # define MMU_IS_851 (0) | ||
278 | #else | ||
279 | # define MMU_IS_SUN3 (0) | ||
280 | # define MMU_IS_851 (1) | ||
281 | #endif | ||
282 | #endif | ||
283 | |||
284 | #if !defined(CONFIG_M68030) | ||
285 | # define CPU_IS_030 (0) | ||
286 | # define MMU_IS_030 (0) | ||
287 | #elif defined(CONFIG_M68020) || defined(CONFIG_M68040) || defined(CONFIG_M68060) | ||
288 | # define CPU_IS_030 (m68k_cputype & CPU_68030) | ||
289 | # define MMU_IS_030 (m68k_mmutype & MMU_68030) | ||
290 | #else | ||
291 | # define CPU_M68030_ONLY | ||
292 | # define CPU_IS_030 (1) | ||
293 | # define MMU_IS_030 (1) | ||
294 | #endif | ||
295 | |||
296 | #if !defined(CONFIG_M68040) | ||
297 | # define CPU_IS_040 (0) | ||
298 | # define MMU_IS_040 (0) | ||
299 | #elif defined(CONFIG_M68020) || defined(CONFIG_M68030) || defined(CONFIG_M68060) | ||
300 | # define CPU_IS_040 (m68k_cputype & CPU_68040) | ||
301 | # define MMU_IS_040 (m68k_mmutype & MMU_68040) | ||
302 | #else | ||
303 | # define CPU_M68040_ONLY | ||
304 | # define CPU_IS_040 (1) | ||
305 | # define MMU_IS_040 (1) | ||
306 | #endif | ||
307 | |||
308 | #if !defined(CONFIG_M68060) | ||
309 | # define CPU_IS_060 (0) | ||
310 | # define MMU_IS_060 (0) | ||
311 | #elif defined(CONFIG_M68020) || defined(CONFIG_M68030) || defined(CONFIG_M68040) | ||
312 | # define CPU_IS_060 (m68k_cputype & CPU_68060) | ||
313 | # define MMU_IS_060 (m68k_mmutype & MMU_68060) | ||
314 | #else | ||
315 | # define CPU_M68060_ONLY | ||
316 | # define CPU_IS_060 (1) | ||
317 | # define MMU_IS_060 (1) | ||
318 | #endif | ||
319 | |||
320 | #if !defined(CONFIG_M68020) && !defined(CONFIG_M68030) | ||
321 | # define CPU_IS_020_OR_030 (0) | ||
322 | #else | ||
323 | # define CPU_M68020_OR_M68030 | ||
324 | # if defined(CONFIG_M68040) || defined(CONFIG_M68060) | ||
325 | # define CPU_IS_020_OR_030 (!m68k_is040or060) | ||
326 | # else | ||
327 | # define CPU_M68020_OR_M68030_ONLY | ||
328 | # define CPU_IS_020_OR_030 (1) | ||
329 | # endif | ||
330 | #endif | ||
331 | |||
332 | #if !defined(CONFIG_M68040) && !defined(CONFIG_M68060) | ||
333 | # define CPU_IS_040_OR_060 (0) | ||
334 | #else | ||
335 | # define CPU_M68040_OR_M68060 | ||
336 | # if defined(CONFIG_M68020) || defined(CONFIG_M68030) | ||
337 | # define CPU_IS_040_OR_060 (m68k_is040or060) | ||
338 | # else | ||
339 | # define CPU_M68040_OR_M68060_ONLY | ||
340 | # define CPU_IS_040_OR_060 (1) | ||
341 | # endif | ||
342 | #endif | ||
343 | |||
344 | #define CPU_TYPE (m68k_cputype) | ||
345 | |||
346 | #ifdef CONFIG_M68KFPU_EMU | ||
347 | # ifdef CONFIG_M68KFPU_EMU_ONLY | ||
348 | # define FPU_IS_EMU (1) | ||
349 | # else | ||
350 | # define FPU_IS_EMU (!m68k_fputype) | ||
351 | # endif | ||
352 | #else | ||
353 | # define FPU_IS_EMU (0) | ||
354 | #endif | ||
355 | |||
356 | |||
357 | /* | ||
358 | * Miscellaneous | ||
359 | */ | ||
360 | |||
361 | #define NUM_MEMINFO 4 | ||
362 | |||
363 | #ifndef __ASSEMBLY__ | ||
364 | struct mem_info { | ||
365 | unsigned long addr; /* physical address of memory chunk */ | ||
366 | unsigned long size; /* length of memory chunk (in bytes) */ | ||
367 | }; | ||
368 | |||
369 | extern int m68k_num_memory; /* # of memory blocks found (and used) */ | ||
370 | extern int m68k_realnum_memory; /* real # of memory blocks found */ | ||
371 | extern struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */ | ||
372 | #endif | ||
373 | |||
374 | #endif /* __KERNEL__ */ | ||
375 | |||
376 | #endif /* _M68K_SETUP_H */ | ||
diff --git a/include/asm-m68k/shm.h b/include/asm-m68k/shm.h deleted file mode 100644 index fa56ec84a126..000000000000 --- a/include/asm-m68k/shm.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #ifndef _M68K_SHM_H | ||
2 | #define _M68K_SHM_H | ||
3 | |||
4 | |||
5 | /* format of page table entries that correspond to shared memory pages | ||
6 | currently out in swap space (see also mm/swap.c): | ||
7 | bits 0-1 (PAGE_PRESENT) is = 0 | ||
8 | bits 8..2 (SWP_TYPE) are = SHM_SWP_TYPE | ||
9 | bits 31..9 are used like this: | ||
10 | bits 15..9 (SHM_ID) the id of the shared memory segment | ||
11 | bits 30..16 (SHM_IDX) the index of the page within the shared memory segment | ||
12 | (actually only bits 25..16 get used since SHMMAX is so low) | ||
13 | bit 31 (SHM_READ_ONLY) flag whether the page belongs to a read-only attach | ||
14 | */ | ||
15 | /* on the m68k both bits 0 and 1 must be zero */ | ||
16 | /* format on the sun3 is similar, but bits 30, 31 are set to zero and all | ||
17 | others are reduced by 2. --m */ | ||
18 | |||
19 | #ifndef CONFIG_SUN3 | ||
20 | #define SHM_ID_SHIFT 9 | ||
21 | #else | ||
22 | #define SHM_ID_SHIFT 7 | ||
23 | #endif | ||
24 | #define _SHM_ID_BITS 7 | ||
25 | #define SHM_ID_MASK ((1<<_SHM_ID_BITS)-1) | ||
26 | |||
27 | #define SHM_IDX_SHIFT (SHM_ID_SHIFT+_SHM_ID_BITS) | ||
28 | #define _SHM_IDX_BITS 15 | ||
29 | #define SHM_IDX_MASK ((1<<_SHM_IDX_BITS)-1) | ||
30 | |||
31 | #endif /* _M68K_SHM_H */ | ||
diff --git a/include/asm-m68k/shmbuf.h b/include/asm-m68k/shmbuf.h deleted file mode 100644 index f8928d62f1b7..000000000000 --- a/include/asm-m68k/shmbuf.h +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | #ifndef _M68K_SHMBUF_H | ||
2 | #define _M68K_SHMBUF_H | ||
3 | |||
4 | /* | ||
5 | * The shmid64_ds structure for m68k 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 | |||
14 | struct shmid64_ds { | ||
15 | struct ipc64_perm shm_perm; /* operation perms */ | ||
16 | size_t shm_segsz; /* size of segment (bytes) */ | ||
17 | __kernel_time_t shm_atime; /* last attach time */ | ||
18 | unsigned long __unused1; | ||
19 | __kernel_time_t shm_dtime; /* last detach time */ | ||
20 | unsigned long __unused2; | ||
21 | __kernel_time_t shm_ctime; /* last change time */ | ||
22 | unsigned long __unused3; | ||
23 | __kernel_pid_t shm_cpid; /* pid of creator */ | ||
24 | __kernel_pid_t shm_lpid; /* pid of last operator */ | ||
25 | unsigned long shm_nattch; /* no. of current attaches */ | ||
26 | unsigned long __unused4; | ||
27 | unsigned long __unused5; | ||
28 | }; | ||
29 | |||
30 | struct shminfo64 { | ||
31 | unsigned long shmmax; | ||
32 | unsigned long shmmin; | ||
33 | unsigned long shmmni; | ||
34 | unsigned long shmseg; | ||
35 | unsigned long shmall; | ||
36 | unsigned long __unused1; | ||
37 | unsigned long __unused2; | ||
38 | unsigned long __unused3; | ||
39 | unsigned long __unused4; | ||
40 | }; | ||
41 | |||
42 | #endif /* _M68K_SHMBUF_H */ | ||
diff --git a/include/asm-m68k/shmparam.h b/include/asm-m68k/shmparam.h deleted file mode 100644 index 558892a2efb3..000000000000 --- a/include/asm-m68k/shmparam.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_SHMPARAM_H | ||
2 | #define _M68K_SHMPARAM_H | ||
3 | |||
4 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ | ||
5 | |||
6 | #endif /* _M68K_SHMPARAM_H */ | ||
diff --git a/include/asm-m68k/sigcontext.h b/include/asm-m68k/sigcontext.h deleted file mode 100644 index 64fbe34cf26f..000000000000 --- a/include/asm-m68k/sigcontext.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | #ifndef _ASM_M68k_SIGCONTEXT_H | ||
2 | #define _ASM_M68k_SIGCONTEXT_H | ||
3 | |||
4 | struct sigcontext { | ||
5 | unsigned long sc_mask; /* old sigmask */ | ||
6 | unsigned long sc_usp; /* old user stack pointer */ | ||
7 | unsigned long sc_d0; | ||
8 | unsigned long sc_d1; | ||
9 | unsigned long sc_a0; | ||
10 | unsigned long sc_a1; | ||
11 | unsigned short sc_sr; | ||
12 | unsigned long sc_pc; | ||
13 | unsigned short sc_formatvec; | ||
14 | unsigned long sc_fpregs[2*3]; /* room for two fp registers */ | ||
15 | unsigned long sc_fpcntl[3]; | ||
16 | unsigned char sc_fpstate[216]; | ||
17 | }; | ||
18 | |||
19 | #endif | ||
diff --git a/include/asm-m68k/siginfo.h b/include/asm-m68k/siginfo.h deleted file mode 100644 index 05a8d6d90b58..000000000000 --- a/include/asm-m68k/siginfo.h +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #ifndef _M68K_SIGINFO_H | ||
2 | #define _M68K_SIGINFO_H | ||
3 | |||
4 | #define HAVE_ARCH_SIGINFO_T | ||
5 | #define HAVE_ARCH_COPY_SIGINFO | ||
6 | |||
7 | #include <asm-generic/siginfo.h> | ||
8 | |||
9 | typedef struct siginfo { | ||
10 | int si_signo; | ||
11 | int si_errno; | ||
12 | int si_code; | ||
13 | |||
14 | union { | ||
15 | int _pad[SI_PAD_SIZE]; | ||
16 | |||
17 | /* kill() */ | ||
18 | struct { | ||
19 | __kernel_pid_t _pid; /* sender's pid */ | ||
20 | __kernel_uid_t _uid; /* backwards compatibility */ | ||
21 | __kernel_uid32_t _uid32; /* sender's uid */ | ||
22 | } _kill; | ||
23 | |||
24 | /* POSIX.1b timers */ | ||
25 | struct { | ||
26 | timer_t _tid; /* timer id */ | ||
27 | int _overrun; /* overrun count */ | ||
28 | char _pad[sizeof( __ARCH_SI_UID_T) - sizeof(int)]; | ||
29 | sigval_t _sigval; /* same as below */ | ||
30 | int _sys_private; /* not to be passed to user */ | ||
31 | } _timer; | ||
32 | |||
33 | /* POSIX.1b signals */ | ||
34 | struct { | ||
35 | __kernel_pid_t _pid; /* sender's pid */ | ||
36 | __kernel_uid_t _uid; /* backwards compatibility */ | ||
37 | sigval_t _sigval; | ||
38 | __kernel_uid32_t _uid32; /* sender's uid */ | ||
39 | } _rt; | ||
40 | |||
41 | /* SIGCHLD */ | ||
42 | struct { | ||
43 | __kernel_pid_t _pid; /* which child */ | ||
44 | __kernel_uid_t _uid; /* backwards compatibility */ | ||
45 | int _status; /* exit code */ | ||
46 | clock_t _utime; | ||
47 | clock_t _stime; | ||
48 | __kernel_uid32_t _uid32; /* sender's uid */ | ||
49 | } _sigchld; | ||
50 | |||
51 | /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ | ||
52 | struct { | ||
53 | void *_addr; /* faulting insn/memory ref. */ | ||
54 | } _sigfault; | ||
55 | |||
56 | /* SIGPOLL */ | ||
57 | struct { | ||
58 | int _band; /* POLL_IN, POLL_OUT, POLL_MSG */ | ||
59 | int _fd; | ||
60 | } _sigpoll; | ||
61 | } _sifields; | ||
62 | } siginfo_t; | ||
63 | |||
64 | #define UID16_SIGINFO_COMPAT_NEEDED | ||
65 | |||
66 | /* | ||
67 | * How these fields are to be accessed. | ||
68 | */ | ||
69 | #undef si_uid | ||
70 | #ifdef __KERNEL__ | ||
71 | #define si_uid _sifields._kill._uid32 | ||
72 | #define si_uid16 _sifields._kill._uid | ||
73 | #else | ||
74 | #define si_uid _sifields._kill._uid | ||
75 | #endif | ||
76 | |||
77 | #ifdef __KERNEL__ | ||
78 | |||
79 | #include <linux/string.h> | ||
80 | |||
81 | static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) | ||
82 | { | ||
83 | if (from->si_code < 0) | ||
84 | memcpy(to, from, sizeof(*to)); | ||
85 | else | ||
86 | /* _sigchld is currently the largest know union member */ | ||
87 | memcpy(to, from, 3*sizeof(int) + sizeof(from->_sifields._sigchld)); | ||
88 | } | ||
89 | |||
90 | #endif /* __KERNEL__ */ | ||
91 | |||
92 | #endif | ||
diff --git a/include/asm-m68k/signal.h b/include/asm-m68k/signal.h deleted file mode 100644 index 3db8a81942f1..000000000000 --- a/include/asm-m68k/signal.h +++ /dev/null | |||
@@ -1,206 +0,0 @@ | |||
1 | #ifndef _M68K_SIGNAL_H | ||
2 | #define _M68K_SIGNAL_H | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | |||
6 | /* Avoid too many header ordering problems. */ | ||
7 | struct siginfo; | ||
8 | |||
9 | #ifdef __KERNEL__ | ||
10 | /* Most things should be clean enough to redefine this at will, if care | ||
11 | is taken to make libc match. */ | ||
12 | |||
13 | #define _NSIG 64 | ||
14 | #define _NSIG_BPW 32 | ||
15 | #define _NSIG_WORDS (_NSIG / _NSIG_BPW) | ||
16 | |||
17 | typedef unsigned long old_sigset_t; /* at least 32 bits */ | ||
18 | |||
19 | typedef struct { | ||
20 | unsigned long sig[_NSIG_WORDS]; | ||
21 | } sigset_t; | ||
22 | |||
23 | #else | ||
24 | /* Here we must cater to libcs that poke about in kernel headers. */ | ||
25 | |||
26 | #define NSIG 32 | ||
27 | typedef unsigned long sigset_t; | ||
28 | |||
29 | #endif /* __KERNEL__ */ | ||
30 | |||
31 | #define SIGHUP 1 | ||
32 | #define SIGINT 2 | ||
33 | #define SIGQUIT 3 | ||
34 | #define SIGILL 4 | ||
35 | #define SIGTRAP 5 | ||
36 | #define SIGABRT 6 | ||
37 | #define SIGIOT 6 | ||
38 | #define SIGBUS 7 | ||
39 | #define SIGFPE 8 | ||
40 | #define SIGKILL 9 | ||
41 | #define SIGUSR1 10 | ||
42 | #define SIGSEGV 11 | ||
43 | #define SIGUSR2 12 | ||
44 | #define SIGPIPE 13 | ||
45 | #define SIGALRM 14 | ||
46 | #define SIGTERM 15 | ||
47 | #define SIGSTKFLT 16 | ||
48 | #define SIGCHLD 17 | ||
49 | #define SIGCONT 18 | ||
50 | #define SIGSTOP 19 | ||
51 | #define SIGTSTP 20 | ||
52 | #define SIGTTIN 21 | ||
53 | #define SIGTTOU 22 | ||
54 | #define SIGURG 23 | ||
55 | #define SIGXCPU 24 | ||
56 | #define SIGXFSZ 25 | ||
57 | #define SIGVTALRM 26 | ||
58 | #define SIGPROF 27 | ||
59 | #define SIGWINCH 28 | ||
60 | #define SIGIO 29 | ||
61 | #define SIGPOLL SIGIO | ||
62 | /* | ||
63 | #define SIGLOST 29 | ||
64 | */ | ||
65 | #define SIGPWR 30 | ||
66 | #define SIGSYS 31 | ||
67 | #define SIGUNUSED 31 | ||
68 | |||
69 | /* These should not be considered constants from userland. */ | ||
70 | #define SIGRTMIN 32 | ||
71 | #define SIGRTMAX _NSIG | ||
72 | |||
73 | /* | ||
74 | * SA_FLAGS values: | ||
75 | * | ||
76 | * SA_ONSTACK indicates that a registered stack_t will be used. | ||
77 | * SA_RESTART flag to get restarting signals (which were the default long ago) | ||
78 | * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. | ||
79 | * SA_RESETHAND clears the handler when the signal is delivered. | ||
80 | * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies. | ||
81 | * SA_NODEFER prevents the current signal from being masked in the handler. | ||
82 | * | ||
83 | * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single | ||
84 | * Unix names RESETHAND and NODEFER respectively. | ||
85 | */ | ||
86 | #define SA_NOCLDSTOP 0x00000001 | ||
87 | #define SA_NOCLDWAIT 0x00000002 | ||
88 | #define SA_SIGINFO 0x00000004 | ||
89 | #define SA_ONSTACK 0x08000000 | ||
90 | #define SA_RESTART 0x10000000 | ||
91 | #define SA_NODEFER 0x40000000 | ||
92 | #define SA_RESETHAND 0x80000000 | ||
93 | |||
94 | #define SA_NOMASK SA_NODEFER | ||
95 | #define SA_ONESHOT SA_RESETHAND | ||
96 | |||
97 | /* | ||
98 | * sigaltstack controls | ||
99 | */ | ||
100 | #define SS_ONSTACK 1 | ||
101 | #define SS_DISABLE 2 | ||
102 | |||
103 | #define MINSIGSTKSZ 2048 | ||
104 | #define SIGSTKSZ 8192 | ||
105 | |||
106 | #include <asm-generic/signal.h> | ||
107 | |||
108 | #ifdef __KERNEL__ | ||
109 | struct old_sigaction { | ||
110 | __sighandler_t sa_handler; | ||
111 | old_sigset_t sa_mask; | ||
112 | unsigned long sa_flags; | ||
113 | __sigrestore_t sa_restorer; | ||
114 | }; | ||
115 | |||
116 | struct sigaction { | ||
117 | __sighandler_t sa_handler; | ||
118 | unsigned long sa_flags; | ||
119 | __sigrestore_t sa_restorer; | ||
120 | sigset_t sa_mask; /* mask last for extensibility */ | ||
121 | }; | ||
122 | |||
123 | struct k_sigaction { | ||
124 | struct sigaction sa; | ||
125 | }; | ||
126 | #else | ||
127 | /* Here we must cater to libcs that poke about in kernel headers. */ | ||
128 | |||
129 | struct sigaction { | ||
130 | union { | ||
131 | __sighandler_t _sa_handler; | ||
132 | void (*_sa_sigaction)(int, struct siginfo *, void *); | ||
133 | } _u; | ||
134 | sigset_t sa_mask; | ||
135 | unsigned long sa_flags; | ||
136 | void (*sa_restorer)(void); | ||
137 | }; | ||
138 | |||
139 | #define sa_handler _u._sa_handler | ||
140 | #define sa_sigaction _u._sa_sigaction | ||
141 | |||
142 | #endif /* __KERNEL__ */ | ||
143 | |||
144 | typedef struct sigaltstack { | ||
145 | void __user *ss_sp; | ||
146 | int ss_flags; | ||
147 | size_t ss_size; | ||
148 | } stack_t; | ||
149 | |||
150 | #ifdef __KERNEL__ | ||
151 | #include <asm/sigcontext.h> | ||
152 | |||
153 | #define __HAVE_ARCH_SIG_BITOPS | ||
154 | |||
155 | static inline void sigaddset(sigset_t *set, int _sig) | ||
156 | { | ||
157 | asm ("bfset %0{%1,#1}" | ||
158 | : "+od" (*set) | ||
159 | : "id" ((_sig - 1) ^ 31) | ||
160 | : "cc"); | ||
161 | } | ||
162 | |||
163 | static inline void sigdelset(sigset_t *set, int _sig) | ||
164 | { | ||
165 | asm ("bfclr %0{%1,#1}" | ||
166 | : "+od" (*set) | ||
167 | : "id" ((_sig - 1) ^ 31) | ||
168 | : "cc"); | ||
169 | } | ||
170 | |||
171 | static inline int __const_sigismember(sigset_t *set, int _sig) | ||
172 | { | ||
173 | unsigned long sig = _sig - 1; | ||
174 | return 1 & (set->sig[sig / _NSIG_BPW] >> (sig % _NSIG_BPW)); | ||
175 | } | ||
176 | |||
177 | static inline int __gen_sigismember(sigset_t *set, int _sig) | ||
178 | { | ||
179 | int ret; | ||
180 | asm ("bfextu %1{%2,#1},%0" | ||
181 | : "=d" (ret) | ||
182 | : "od" (*set), "id" ((_sig-1) ^ 31) | ||
183 | : "cc"); | ||
184 | return ret; | ||
185 | } | ||
186 | |||
187 | #define sigismember(set,sig) \ | ||
188 | (__builtin_constant_p(sig) ? \ | ||
189 | __const_sigismember(set,sig) : \ | ||
190 | __gen_sigismember(set,sig)) | ||
191 | |||
192 | static inline int sigfindinword(unsigned long word) | ||
193 | { | ||
194 | asm ("bfffo %1{#0,#0},%0" | ||
195 | : "=d" (word) | ||
196 | : "d" (word & -word) | ||
197 | : "cc"); | ||
198 | return word ^ 31; | ||
199 | } | ||
200 | |||
201 | struct pt_regs; | ||
202 | extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie); | ||
203 | |||
204 | #endif /* __KERNEL__ */ | ||
205 | |||
206 | #endif /* _M68K_SIGNAL_H */ | ||
diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h deleted file mode 100644 index dbc64e92c41a..000000000000 --- a/include/asm-m68k/socket.h +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | #ifndef _ASM_SOCKET_H | ||
2 | #define _ASM_SOCKET_H | ||
3 | |||
4 | #include <asm/sockios.h> | ||
5 | |||
6 | /* For setsockopt(2) */ | ||
7 | #define SOL_SOCKET 1 | ||
8 | |||
9 | #define SO_DEBUG 1 | ||
10 | #define SO_REUSEADDR 2 | ||
11 | #define SO_TYPE 3 | ||
12 | #define SO_ERROR 4 | ||
13 | #define SO_DONTROUTE 5 | ||
14 | #define SO_BROADCAST 6 | ||
15 | #define SO_SNDBUF 7 | ||
16 | #define SO_RCVBUF 8 | ||
17 | #define SO_SNDBUFFORCE 32 | ||
18 | #define SO_RCVBUFFORCE 33 | ||
19 | #define SO_KEEPALIVE 9 | ||
20 | #define SO_OOBINLINE 10 | ||
21 | #define SO_NO_CHECK 11 | ||
22 | #define SO_PRIORITY 12 | ||
23 | #define SO_LINGER 13 | ||
24 | #define SO_BSDCOMPAT 14 | ||
25 | /* To add :#define SO_REUSEPORT 15 */ | ||
26 | #define SO_PASSCRED 16 | ||
27 | #define SO_PEERCRED 17 | ||
28 | #define SO_RCVLOWAT 18 | ||
29 | #define SO_SNDLOWAT 19 | ||
30 | #define SO_RCVTIMEO 20 | ||
31 | #define SO_SNDTIMEO 21 | ||
32 | |||
33 | /* Security levels - as per NRL IPv6 - don't actually do anything */ | ||
34 | #define SO_SECURITY_AUTHENTICATION 22 | ||
35 | #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 | ||
36 | #define SO_SECURITY_ENCRYPTION_NETWORK 24 | ||
37 | |||
38 | #define SO_BINDTODEVICE 25 | ||
39 | |||
40 | /* Socket filtering */ | ||
41 | #define SO_ATTACH_FILTER 26 | ||
42 | #define SO_DETACH_FILTER 27 | ||
43 | |||
44 | #define SO_PEERNAME 28 | ||
45 | #define SO_TIMESTAMP 29 | ||
46 | #define SCM_TIMESTAMP SO_TIMESTAMP | ||
47 | |||
48 | #define SO_ACCEPTCONN 30 | ||
49 | |||
50 | #define SO_PEERSEC 31 | ||
51 | #define SO_PASSSEC 34 | ||
52 | #define SO_TIMESTAMPNS 35 | ||
53 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
54 | |||
55 | #define SO_MARK 36 | ||
56 | |||
57 | #endif /* _ASM_SOCKET_H */ | ||
diff --git a/include/asm-m68k/sockios.h b/include/asm-m68k/sockios.h deleted file mode 100644 index c04a23943cb7..000000000000 --- a/include/asm-m68k/sockios.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __ARCH_M68K_SOCKIOS__ | ||
2 | #define __ARCH_M68K_SOCKIOS__ | ||
3 | |||
4 | /* Socket-level I/O control calls. */ | ||
5 | #define FIOSETOWN 0x8901 | ||
6 | #define SIOCSPGRP 0x8902 | ||
7 | #define FIOGETOWN 0x8903 | ||
8 | #define SIOCGPGRP 0x8904 | ||
9 | #define SIOCATMARK 0x8905 | ||
10 | #define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ | ||
11 | #define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ | ||
12 | |||
13 | #endif /* __ARCH_M68K_SOCKIOS__ */ | ||
diff --git a/include/asm-m68k/spinlock.h b/include/asm-m68k/spinlock.h deleted file mode 100644 index 20f46e27b534..000000000000 --- a/include/asm-m68k/spinlock.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __M68K_SPINLOCK_H | ||
2 | #define __M68K_SPINLOCK_H | ||
3 | |||
4 | #error "m68k doesn't do SMP yet" | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-m68k/stat.h b/include/asm-m68k/stat.h deleted file mode 100644 index dd38bc2e9f98..000000000000 --- a/include/asm-m68k/stat.h +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | #ifndef _M68K_STAT_H | ||
2 | #define _M68K_STAT_H | ||
3 | |||
4 | struct __old_kernel_stat { | ||
5 | unsigned short st_dev; | ||
6 | unsigned short st_ino; | ||
7 | unsigned short st_mode; | ||
8 | unsigned short st_nlink; | ||
9 | unsigned short st_uid; | ||
10 | unsigned short st_gid; | ||
11 | unsigned short st_rdev; | ||
12 | unsigned long st_size; | ||
13 | unsigned long st_atime; | ||
14 | unsigned long st_mtime; | ||
15 | unsigned long st_ctime; | ||
16 | }; | ||
17 | |||
18 | struct stat { | ||
19 | unsigned short st_dev; | ||
20 | unsigned short __pad1; | ||
21 | unsigned long st_ino; | ||
22 | unsigned short st_mode; | ||
23 | unsigned short st_nlink; | ||
24 | unsigned short st_uid; | ||
25 | unsigned short st_gid; | ||
26 | unsigned short st_rdev; | ||
27 | unsigned short __pad2; | ||
28 | unsigned long st_size; | ||
29 | unsigned long st_blksize; | ||
30 | unsigned long st_blocks; | ||
31 | unsigned long st_atime; | ||
32 | unsigned long __unused1; | ||
33 | unsigned long st_mtime; | ||
34 | unsigned long __unused2; | ||
35 | unsigned long st_ctime; | ||
36 | unsigned long __unused3; | ||
37 | unsigned long __unused4; | ||
38 | unsigned long __unused5; | ||
39 | }; | ||
40 | |||
41 | /* This matches struct stat64 in glibc2.1, hence the absolutely | ||
42 | * insane amounts of padding around dev_t's. | ||
43 | */ | ||
44 | struct stat64 { | ||
45 | unsigned long long st_dev; | ||
46 | unsigned char __pad1[2]; | ||
47 | |||
48 | #define STAT64_HAS_BROKEN_ST_INO 1 | ||
49 | unsigned long __st_ino; | ||
50 | |||
51 | unsigned int st_mode; | ||
52 | unsigned int st_nlink; | ||
53 | |||
54 | unsigned long st_uid; | ||
55 | unsigned long st_gid; | ||
56 | |||
57 | unsigned long long st_rdev; | ||
58 | unsigned char __pad3[2]; | ||
59 | |||
60 | long long st_size; | ||
61 | unsigned long st_blksize; | ||
62 | |||
63 | unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ | ||
64 | |||
65 | unsigned long st_atime; | ||
66 | unsigned long st_atime_nsec; | ||
67 | |||
68 | unsigned long st_mtime; | ||
69 | unsigned long st_mtime_nsec; | ||
70 | |||
71 | unsigned long st_ctime; | ||
72 | unsigned long st_ctime_nsec; | ||
73 | |||
74 | unsigned long long st_ino; | ||
75 | }; | ||
76 | |||
77 | #endif /* _M68K_STAT_H */ | ||
diff --git a/include/asm-m68k/statfs.h b/include/asm-m68k/statfs.h deleted file mode 100644 index 08d93f14e061..000000000000 --- a/include/asm-m68k/statfs.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_STATFS_H | ||
2 | #define _M68K_STATFS_H | ||
3 | |||
4 | #include <asm-generic/statfs.h> | ||
5 | |||
6 | #endif /* _M68K_STATFS_H */ | ||
diff --git a/include/asm-m68k/string.h b/include/asm-m68k/string.h deleted file mode 100644 index 2eb7df1e0f5d..000000000000 --- a/include/asm-m68k/string.h +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | #ifndef _M68K_STRING_H_ | ||
2 | #define _M68K_STRING_H_ | ||
3 | |||
4 | #include <linux/types.h> | ||
5 | #include <linux/compiler.h> | ||
6 | |||
7 | static inline size_t __kernel_strlen(const char *s) | ||
8 | { | ||
9 | const char *sc; | ||
10 | |||
11 | for (sc = s; *sc++; ) | ||
12 | ; | ||
13 | return sc - s - 1; | ||
14 | } | ||
15 | |||
16 | static inline char *__kernel_strcpy(char *dest, const char *src) | ||
17 | { | ||
18 | char *xdest = dest; | ||
19 | |||
20 | asm volatile ("\n" | ||
21 | "1: move.b (%1)+,(%0)+\n" | ||
22 | " jne 1b" | ||
23 | : "+a" (dest), "+a" (src) | ||
24 | : : "memory"); | ||
25 | return xdest; | ||
26 | } | ||
27 | |||
28 | #ifndef __IN_STRING_C | ||
29 | |||
30 | #define __HAVE_ARCH_STRLEN | ||
31 | #define strlen(s) (__builtin_constant_p(s) ? \ | ||
32 | __builtin_strlen(s) : \ | ||
33 | __kernel_strlen(s)) | ||
34 | |||
35 | #define __HAVE_ARCH_STRNLEN | ||
36 | static inline size_t strnlen(const char *s, size_t count) | ||
37 | { | ||
38 | const char *sc = s; | ||
39 | |||
40 | asm volatile ("\n" | ||
41 | "1: subq.l #1,%1\n" | ||
42 | " jcs 2f\n" | ||
43 | " tst.b (%0)+\n" | ||
44 | " jne 1b\n" | ||
45 | " subq.l #1,%0\n" | ||
46 | "2:" | ||
47 | : "+a" (sc), "+d" (count)); | ||
48 | return sc - s; | ||
49 | } | ||
50 | |||
51 | #define __HAVE_ARCH_STRCPY | ||
52 | #if __GNUC__ >= 4 | ||
53 | #define strcpy(d, s) (__builtin_constant_p(s) && \ | ||
54 | __builtin_strlen(s) <= 32 ? \ | ||
55 | __builtin_strcpy(d, s) : \ | ||
56 | __kernel_strcpy(d, s)) | ||
57 | #else | ||
58 | #define strcpy(d, s) __kernel_strcpy(d, s) | ||
59 | #endif | ||
60 | |||
61 | #define __HAVE_ARCH_STRNCPY | ||
62 | static inline char *strncpy(char *dest, const char *src, size_t n) | ||
63 | { | ||
64 | char *xdest = dest; | ||
65 | |||
66 | asm volatile ("\n" | ||
67 | " jra 2f\n" | ||
68 | "1: move.b (%1),(%0)+\n" | ||
69 | " jeq 2f\n" | ||
70 | " addq.l #1,%1\n" | ||
71 | "2: subq.l #1,%2\n" | ||
72 | " jcc 1b\n" | ||
73 | : "+a" (dest), "+a" (src), "+d" (n) | ||
74 | : : "memory"); | ||
75 | return xdest; | ||
76 | } | ||
77 | |||
78 | #define __HAVE_ARCH_STRCAT | ||
79 | #define strcat(d, s) ({ \ | ||
80 | char *__d = (d); \ | ||
81 | strcpy(__d + strlen(__d), (s)); \ | ||
82 | }) | ||
83 | |||
84 | #define __HAVE_ARCH_STRCHR | ||
85 | static inline char *strchr(const char *s, int c) | ||
86 | { | ||
87 | char sc, ch = c; | ||
88 | |||
89 | for (; (sc = *s++) != ch; ) { | ||
90 | if (!sc) | ||
91 | return NULL; | ||
92 | } | ||
93 | return (char *)s - 1; | ||
94 | } | ||
95 | |||
96 | #define __HAVE_ARCH_STRCMP | ||
97 | static inline int strcmp(const char *cs, const char *ct) | ||
98 | { | ||
99 | char res; | ||
100 | |||
101 | asm ("\n" | ||
102 | "1: move.b (%0)+,%2\n" /* get *cs */ | ||
103 | " cmp.b (%1)+,%2\n" /* compare a byte */ | ||
104 | " jne 2f\n" /* not equal, break out */ | ||
105 | " tst.b %2\n" /* at end of cs? */ | ||
106 | " jne 1b\n" /* no, keep going */ | ||
107 | " jra 3f\n" /* strings are equal */ | ||
108 | "2: sub.b -(%1),%2\n" /* *cs - *ct */ | ||
109 | "3:" | ||
110 | : "+a" (cs), "+a" (ct), "=d" (res)); | ||
111 | return res; | ||
112 | } | ||
113 | |||
114 | #define __HAVE_ARCH_MEMSET | ||
115 | extern void *memset(void *, int, __kernel_size_t); | ||
116 | #define memset(d, c, n) __builtin_memset(d, c, n) | ||
117 | |||
118 | #define __HAVE_ARCH_MEMCPY | ||
119 | extern void *memcpy(void *, const void *, __kernel_size_t); | ||
120 | #define memcpy(d, s, n) __builtin_memcpy(d, s, n) | ||
121 | |||
122 | #define __HAVE_ARCH_MEMMOVE | ||
123 | extern void *memmove(void *, const void *, __kernel_size_t); | ||
124 | |||
125 | #define __HAVE_ARCH_MEMCMP | ||
126 | extern int memcmp(const void *, const void *, __kernel_size_t); | ||
127 | #define memcmp(d, s, n) __builtin_memcmp(d, s, n) | ||
128 | |||
129 | #endif | ||
130 | |||
131 | #endif /* _M68K_STRING_H_ */ | ||
diff --git a/include/asm-m68k/sun3-head.h b/include/asm-m68k/sun3-head.h deleted file mode 100644 index 05af2f18b3bd..000000000000 --- a/include/asm-m68k/sun3-head.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef __SUN3_HEAD_H | ||
2 | #define __SUN3_HEAD_H | ||
3 | |||
4 | #define KERNBASE 0xE000000 /* First address the kernel will eventually be */ | ||
5 | #define LOAD_ADDR 0x4000 /* prom jumps to us here unless this is elf /boot */ | ||
6 | #define FC_CONTROL 3 | ||
7 | #define FC_SUPERD 5 | ||
8 | #define FC_CPU 7 | ||
9 | |||
10 | #endif /* __SUN3_HEAD_H */ | ||
diff --git a/include/asm-m68k/sun3_pgalloc.h b/include/asm-m68k/sun3_pgalloc.h deleted file mode 100644 index d4c83f143816..000000000000 --- a/include/asm-m68k/sun3_pgalloc.h +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | /* sun3_pgalloc.h -- | ||
2 | * reorganization around 2.3.39, routines moved from sun3_pgtable.h | ||
3 | * | ||
4 | * | ||
5 | * 02/27/2002 -- Modified to support "highpte" implementation in 2.5.5 (Sam) | ||
6 | * | ||
7 | * moved 1/26/2000 Sam Creasey | ||
8 | */ | ||
9 | |||
10 | #ifndef _SUN3_PGALLOC_H | ||
11 | #define _SUN3_PGALLOC_H | ||
12 | |||
13 | #include <asm/tlb.h> | ||
14 | |||
15 | /* FIXME - when we get this compiling */ | ||
16 | /* erm, now that it's compiling, what do we do with it? */ | ||
17 | #define _KERNPG_TABLE 0 | ||
18 | |||
19 | extern const char bad_pmd_string[]; | ||
20 | |||
21 | #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) | ||
22 | |||
23 | |||
24 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) | ||
25 | { | ||
26 | free_page((unsigned long) pte); | ||
27 | } | ||
28 | |||
29 | static inline void pte_free(struct mm_struct *mm, pgtable_t page) | ||
30 | { | ||
31 | pgtable_page_dtor(page); | ||
32 | __free_page(page); | ||
33 | } | ||
34 | |||
35 | #define __pte_free_tlb(tlb,pte) \ | ||
36 | do { \ | ||
37 | pgtable_page_dtor(pte); \ | ||
38 | tlb_remove_page((tlb), pte); \ | ||
39 | } while (0) | ||
40 | |||
41 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | ||
42 | unsigned long address) | ||
43 | { | ||
44 | unsigned long page = __get_free_page(GFP_KERNEL|__GFP_REPEAT); | ||
45 | |||
46 | if (!page) | ||
47 | return NULL; | ||
48 | |||
49 | memset((void *)page, 0, PAGE_SIZE); | ||
50 | return (pte_t *) (page); | ||
51 | } | ||
52 | |||
53 | static inline pgtable_t pte_alloc_one(struct mm_struct *mm, | ||
54 | unsigned long address) | ||
55 | { | ||
56 | struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0); | ||
57 | |||
58 | if (page == NULL) | ||
59 | return NULL; | ||
60 | |||
61 | clear_highpage(page); | ||
62 | pgtable_page_ctor(page); | ||
63 | return page; | ||
64 | |||
65 | } | ||
66 | |||
67 | static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) | ||
68 | { | ||
69 | pmd_val(*pmd) = __pa((unsigned long)pte); | ||
70 | } | ||
71 | |||
72 | static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) | ||
73 | { | ||
74 | pmd_val(*pmd) = __pa((unsigned long)page_address(page)); | ||
75 | } | ||
76 | #define pmd_pgtable(pmd) pmd_page(pmd) | ||
77 | |||
78 | /* | ||
79 | * allocating and freeing a pmd is trivial: the 1-entry pmd is | ||
80 | * inside the pgd, so has no extra memory associated with it. | ||
81 | */ | ||
82 | #define pmd_free(mm, x) do { } while (0) | ||
83 | #define __pmd_free_tlb(tlb, x) do { } while (0) | ||
84 | |||
85 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) | ||
86 | { | ||
87 | free_page((unsigned long) pgd); | ||
88 | } | ||
89 | |||
90 | static inline pgd_t * pgd_alloc(struct mm_struct *mm) | ||
91 | { | ||
92 | pgd_t *new_pgd; | ||
93 | |||
94 | new_pgd = (pgd_t *)get_zeroed_page(GFP_KERNEL); | ||
95 | memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); | ||
96 | memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); | ||
97 | return new_pgd; | ||
98 | } | ||
99 | |||
100 | #define pgd_populate(mm, pmd, pte) BUG() | ||
101 | |||
102 | #endif /* SUN3_PGALLOC_H */ | ||
diff --git a/include/asm-m68k/sun3_pgtable.h b/include/asm-m68k/sun3_pgtable.h deleted file mode 100644 index f847ec732d62..000000000000 --- a/include/asm-m68k/sun3_pgtable.h +++ /dev/null | |||
@@ -1,234 +0,0 @@ | |||
1 | #ifndef _SUN3_PGTABLE_H | ||
2 | #define _SUN3_PGTABLE_H | ||
3 | |||
4 | #include <asm/sun3mmu.h> | ||
5 | |||
6 | #ifndef __ASSEMBLY__ | ||
7 | #include <asm/virtconvert.h> | ||
8 | #include <linux/linkage.h> | ||
9 | |||
10 | /* | ||
11 | * This file contains all the things which change drastically for the sun3 | ||
12 | * pagetable stuff, to avoid making too much of a mess of the generic m68k | ||
13 | * `pgtable.h'; this should only be included from the generic file. --m | ||
14 | */ | ||
15 | |||
16 | /* For virtual address to physical address conversion */ | ||
17 | #define VTOP(addr) __pa(addr) | ||
18 | #define PTOV(addr) __va(addr) | ||
19 | |||
20 | |||
21 | #endif /* !__ASSEMBLY__ */ | ||
22 | |||
23 | /* These need to be defined for compatibility although the sun3 doesn't use them */ | ||
24 | #define _PAGE_NOCACHE030 0x040 | ||
25 | #define _CACHEMASK040 (~0x060) | ||
26 | #define _PAGE_NOCACHE_S 0x040 | ||
27 | |||
28 | /* Page protection values within PTE. */ | ||
29 | #define SUN3_PAGE_VALID (0x80000000) | ||
30 | #define SUN3_PAGE_WRITEABLE (0x40000000) | ||
31 | #define SUN3_PAGE_SYSTEM (0x20000000) | ||
32 | #define SUN3_PAGE_NOCACHE (0x10000000) | ||
33 | #define SUN3_PAGE_ACCESSED (0x02000000) | ||
34 | #define SUN3_PAGE_MODIFIED (0x01000000) | ||
35 | |||
36 | |||
37 | /* Externally used page protection values. */ | ||
38 | #define _PAGE_PRESENT (SUN3_PAGE_VALID) | ||
39 | #define _PAGE_ACCESSED (SUN3_PAGE_ACCESSED) | ||
40 | |||
41 | #define PTE_FILE_MAX_BITS 28 | ||
42 | |||
43 | /* Compound page protection values. */ | ||
44 | //todo: work out which ones *should* have SUN3_PAGE_NOCACHE and fix... | ||
45 | // is it just PAGE_KERNEL and PAGE_SHARED? | ||
46 | #define PAGE_NONE __pgprot(SUN3_PAGE_VALID \ | ||
47 | | SUN3_PAGE_ACCESSED \ | ||
48 | | SUN3_PAGE_NOCACHE) | ||
49 | #define PAGE_SHARED __pgprot(SUN3_PAGE_VALID \ | ||
50 | | SUN3_PAGE_WRITEABLE \ | ||
51 | | SUN3_PAGE_ACCESSED \ | ||
52 | | SUN3_PAGE_NOCACHE) | ||
53 | #define PAGE_COPY __pgprot(SUN3_PAGE_VALID \ | ||
54 | | SUN3_PAGE_ACCESSED \ | ||
55 | | SUN3_PAGE_NOCACHE) | ||
56 | #define PAGE_READONLY __pgprot(SUN3_PAGE_VALID \ | ||
57 | | SUN3_PAGE_ACCESSED \ | ||
58 | | SUN3_PAGE_NOCACHE) | ||
59 | #define PAGE_KERNEL __pgprot(SUN3_PAGE_VALID \ | ||
60 | | SUN3_PAGE_WRITEABLE \ | ||
61 | | SUN3_PAGE_SYSTEM \ | ||
62 | | SUN3_PAGE_NOCACHE \ | ||
63 | | SUN3_PAGE_ACCESSED \ | ||
64 | | SUN3_PAGE_MODIFIED) | ||
65 | #define PAGE_INIT __pgprot(SUN3_PAGE_VALID \ | ||
66 | | SUN3_PAGE_WRITEABLE \ | ||
67 | | SUN3_PAGE_SYSTEM \ | ||
68 | | SUN3_PAGE_NOCACHE) | ||
69 | |||
70 | /* | ||
71 | * Page protections for initialising protection_map. The sun3 has only two | ||
72 | * protection settings, valid (implying read and execute) and writeable. These | ||
73 | * are as close as we can get... | ||
74 | */ | ||
75 | #define __P000 PAGE_NONE | ||
76 | #define __P001 PAGE_READONLY | ||
77 | #define __P010 PAGE_COPY | ||
78 | #define __P011 PAGE_COPY | ||
79 | #define __P100 PAGE_READONLY | ||
80 | #define __P101 PAGE_READONLY | ||
81 | #define __P110 PAGE_COPY | ||
82 | #define __P111 PAGE_COPY | ||
83 | |||
84 | #define __S000 PAGE_NONE | ||
85 | #define __S001 PAGE_READONLY | ||
86 | #define __S010 PAGE_SHARED | ||
87 | #define __S011 PAGE_SHARED | ||
88 | #define __S100 PAGE_READONLY | ||
89 | #define __S101 PAGE_READONLY | ||
90 | #define __S110 PAGE_SHARED | ||
91 | #define __S111 PAGE_SHARED | ||
92 | |||
93 | /* Use these fake page-protections on PMDs. */ | ||
94 | #define SUN3_PMD_VALID (0x00000001) | ||
95 | #define SUN3_PMD_MASK (0x0000003F) | ||
96 | #define SUN3_PMD_MAGIC (0x0000002B) | ||
97 | |||
98 | #ifndef __ASSEMBLY__ | ||
99 | |||
100 | /* | ||
101 | * Conversion functions: convert a page and protection to a page entry, | ||
102 | * and a page entry and page directory to the page they refer to. | ||
103 | */ | ||
104 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
105 | |||
106 | static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | ||
107 | { | ||
108 | pte_val(pte) = (pte_val(pte) & SUN3_PAGE_CHG_MASK) | pgprot_val(newprot); | ||
109 | return pte; | ||
110 | } | ||
111 | |||
112 | #define pmd_set(pmdp,ptep) do {} while (0) | ||
113 | |||
114 | static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) | ||
115 | { | ||
116 | pgd_val(*pgdp) = virt_to_phys(pmdp); | ||
117 | } | ||
118 | |||
119 | #define __pte_page(pte) \ | ||
120 | ((unsigned long) __va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT)) | ||
121 | #define __pmd_page(pmd) \ | ||
122 | ((unsigned long) __va (pmd_val (pmd) & PAGE_MASK)) | ||
123 | |||
124 | static inline int pte_none (pte_t pte) { return !pte_val (pte); } | ||
125 | static inline int pte_present (pte_t pte) { return pte_val (pte) & SUN3_PAGE_VALID; } | ||
126 | static inline void pte_clear (struct mm_struct *mm, unsigned long addr, pte_t *ptep) | ||
127 | { | ||
128 | pte_val (*ptep) = 0; | ||
129 | } | ||
130 | |||
131 | #define pte_pfn(pte) (pte_val(pte) & SUN3_PAGE_PGNUM_MASK) | ||
132 | #define pfn_pte(pfn, pgprot) \ | ||
133 | ({ pte_t __pte; pte_val(__pte) = pfn | pgprot_val(pgprot); __pte; }) | ||
134 | |||
135 | #define pte_page(pte) virt_to_page(__pte_page(pte)) | ||
136 | #define pmd_page(pmd) virt_to_page(__pmd_page(pmd)) | ||
137 | |||
138 | |||
139 | static inline int pmd_none2 (pmd_t *pmd) { return !pmd_val (*pmd); } | ||
140 | #define pmd_none(pmd) pmd_none2(&(pmd)) | ||
141 | //static inline int pmd_bad (pmd_t pmd) { return (pmd_val (pmd) & SUN3_PMD_MASK) != SUN3_PMD_MAGIC; } | ||
142 | static inline int pmd_bad2 (pmd_t *pmd) { return 0; } | ||
143 | #define pmd_bad(pmd) pmd_bad2(&(pmd)) | ||
144 | static inline int pmd_present2 (pmd_t *pmd) { return pmd_val (*pmd) & SUN3_PMD_VALID; } | ||
145 | /* #define pmd_present(pmd) pmd_present2(&(pmd)) */ | ||
146 | #define pmd_present(pmd) (!pmd_none2(&(pmd))) | ||
147 | static inline void pmd_clear (pmd_t *pmdp) { pmd_val (*pmdp) = 0; } | ||
148 | |||
149 | static inline int pgd_none (pgd_t pgd) { return 0; } | ||
150 | static inline int pgd_bad (pgd_t pgd) { return 0; } | ||
151 | static inline int pgd_present (pgd_t pgd) { return 1; } | ||
152 | static inline void pgd_clear (pgd_t *pgdp) {} | ||
153 | |||
154 | |||
155 | #define pte_ERROR(e) \ | ||
156 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) | ||
157 | #define pmd_ERROR(e) \ | ||
158 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e)) | ||
159 | #define pgd_ERROR(e) \ | ||
160 | printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) | ||
161 | |||
162 | |||
163 | /* | ||
164 | * The following only work if pte_present() is true. | ||
165 | * Undefined behaviour if not... | ||
166 | * [we have the full set here even if they don't change from m68k] | ||
167 | */ | ||
168 | static inline int pte_write(pte_t pte) { return pte_val(pte) & SUN3_PAGE_WRITEABLE; } | ||
169 | static inline int pte_dirty(pte_t pte) { return pte_val(pte) & SUN3_PAGE_MODIFIED; } | ||
170 | static inline int pte_young(pte_t pte) { return pte_val(pte) & SUN3_PAGE_ACCESSED; } | ||
171 | static inline int pte_file(pte_t pte) { return pte_val(pte) & SUN3_PAGE_ACCESSED; } | ||
172 | static inline int pte_special(pte_t pte) { return 0; } | ||
173 | |||
174 | static inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~SUN3_PAGE_WRITEABLE; return pte; } | ||
175 | static inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~SUN3_PAGE_MODIFIED; return pte; } | ||
176 | static inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~SUN3_PAGE_ACCESSED; return pte; } | ||
177 | static inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= SUN3_PAGE_WRITEABLE; return pte; } | ||
178 | static inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= SUN3_PAGE_MODIFIED; return pte; } | ||
179 | static inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= SUN3_PAGE_ACCESSED; return pte; } | ||
180 | static inline pte_t pte_mknocache(pte_t pte) { pte_val(pte) |= SUN3_PAGE_NOCACHE; return pte; } | ||
181 | // use this version when caches work... | ||
182 | //static inline pte_t pte_mkcache(pte_t pte) { pte_val(pte) &= SUN3_PAGE_NOCACHE; return pte; } | ||
183 | // until then, use: | ||
184 | static inline pte_t pte_mkcache(pte_t pte) { return pte; } | ||
185 | static inline pte_t pte_mkspecial(pte_t pte) { return pte; } | ||
186 | |||
187 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | ||
188 | extern pgd_t kernel_pg_dir[PTRS_PER_PGD]; | ||
189 | |||
190 | /* Find an entry in a pagetable directory. */ | ||
191 | #define pgd_index(address) ((address) >> PGDIR_SHIFT) | ||
192 | |||
193 | #define pgd_offset(mm, address) \ | ||
194 | ((mm)->pgd + pgd_index(address)) | ||
195 | |||
196 | /* Find an entry in a kernel pagetable directory. */ | ||
197 | #define pgd_offset_k(address) pgd_offset(&init_mm, address) | ||
198 | |||
199 | /* Find an entry in the second-level pagetable. */ | ||
200 | static inline pmd_t *pmd_offset (pgd_t *pgd, unsigned long address) | ||
201 | { | ||
202 | return (pmd_t *) pgd; | ||
203 | } | ||
204 | |||
205 | static inline unsigned long pte_to_pgoff(pte_t pte) | ||
206 | { | ||
207 | return pte.pte & SUN3_PAGE_PGNUM_MASK; | ||
208 | } | ||
209 | |||
210 | static inline pte_t pgoff_to_pte(unsigned off) | ||
211 | { | ||
212 | pte_t pte = { off + SUN3_PAGE_ACCESSED }; | ||
213 | return pte; | ||
214 | } | ||
215 | |||
216 | |||
217 | /* Find an entry in the third-level pagetable. */ | ||
218 | #define pte_index(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1)) | ||
219 | #define pte_offset_kernel(pmd, address) ((pte_t *) __pmd_page(*pmd) + pte_index(address)) | ||
220 | /* FIXME: should we bother with kmap() here? */ | ||
221 | #define pte_offset_map(pmd, address) ((pte_t *)kmap(pmd_page(*pmd)) + pte_index(address)) | ||
222 | #define pte_offset_map_nested(pmd, address) pte_offset_map(pmd, address) | ||
223 | #define pte_unmap(pte) kunmap(pte) | ||
224 | #define pte_unmap_nested(pte) kunmap(pte) | ||
225 | |||
226 | /* Macros to (de)construct the fake PTEs representing swap pages. */ | ||
227 | #define __swp_type(x) ((x).val & 0x7F) | ||
228 | #define __swp_offset(x) (((x).val) >> 7) | ||
229 | #define __swp_entry(type,offset) ((swp_entry_t) { ((type) | ((offset) << 7)) }) | ||
230 | #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) }) | ||
231 | #define __swp_entry_to_pte(x) ((pte_t) { (x).val }) | ||
232 | |||
233 | #endif /* !__ASSEMBLY__ */ | ||
234 | #endif /* !_SUN3_PGTABLE_H */ | ||
diff --git a/include/asm-m68k/sun3ints.h b/include/asm-m68k/sun3ints.h deleted file mode 100644 index 309d6e6a1374..000000000000 --- a/include/asm-m68k/sun3ints.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * sun3ints.h -- Linux/Sun3 interrupt handling code definitions | ||
3 | * | ||
4 | * Erik Verbruggen (erik@bigmama.xtdnet.nl) | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive for | ||
8 | * more details. | ||
9 | */ | ||
10 | |||
11 | #ifndef SUN3INTS_H | ||
12 | #define SUN3INTS_H | ||
13 | |||
14 | #include <linux/types.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <asm/intersil.h> | ||
17 | #include <asm/oplib.h> | ||
18 | #include <asm/traps.h> | ||
19 | #include <asm/irq.h> | ||
20 | |||
21 | #define SUN3_INT_VECS 192 | ||
22 | |||
23 | void sun3_enable_irq(unsigned int irq); | ||
24 | void sun3_disable_irq(unsigned int irq); | ||
25 | extern void sun3_init_IRQ (void); | ||
26 | extern void sun3_enable_interrupts (void); | ||
27 | extern void sun3_disable_interrupts (void); | ||
28 | extern volatile unsigned char* sun3_intreg; | ||
29 | |||
30 | /* master list of VME vectors -- don't fuck with this */ | ||
31 | #define SUN3_VEC_FLOPPY (IRQ_USER+0) | ||
32 | #define SUN3_VEC_VMESCSI0 (IRQ_USER+0) | ||
33 | #define SUN3_VEC_VMESCSI1 (IRQ_USER+1) | ||
34 | #define SUN3_VEC_CG (IRQ_USER+104) | ||
35 | |||
36 | |||
37 | #endif /* SUN3INTS_H */ | ||
diff --git a/include/asm-m68k/sun3mmu.h b/include/asm-m68k/sun3mmu.h deleted file mode 100644 index d8f17a0d8c9f..000000000000 --- a/include/asm-m68k/sun3mmu.h +++ /dev/null | |||
@@ -1,171 +0,0 @@ | |||
1 | /* | ||
2 | * Definitions for Sun3 custom MMU. | ||
3 | */ | ||
4 | #ifndef __SUN3_MMU_H__ | ||
5 | #define __SUN3_MMU_H__ | ||
6 | |||
7 | #include <linux/types.h> | ||
8 | #include <asm/movs.h> | ||
9 | #include <asm/sun3-head.h> | ||
10 | |||
11 | /* MMU characteristics. */ | ||
12 | #define SUN3_SEGMAPS_PER_CONTEXT 2048 | ||
13 | #define SUN3_PMEGS_NUM 256 | ||
14 | #define SUN3_CONTEXTS_NUM 8 | ||
15 | |||
16 | #define SUN3_PMEG_SIZE_BITS 17 | ||
17 | #define SUN3_PMEG_SIZE (1 << SUN3_PMEG_SIZE_BITS) | ||
18 | #define SUN3_PMEG_MASK (SUN3_PMEG_SIZE - 1) | ||
19 | |||
20 | #define SUN3_PTE_SIZE_BITS 13 | ||
21 | #define SUN3_PTE_SIZE (1 << SUN3_PTE_SIZE_BITS) | ||
22 | #define SUN3_PTE_MASK (SUN3_PTE_SIZE - 1) | ||
23 | |||
24 | #define SUN3_CONTROL_MASK (0x0FFFFFFC) | ||
25 | #define SUN3_INVALID_PMEG 255 | ||
26 | #define SUN3_INVALID_CONTEXT 255 | ||
27 | |||
28 | #define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */ | ||
29 | #define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */ | ||
30 | #define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */ | ||
31 | #define AC_CONTEXT 0x30000000 /* 34c current mmu-context */ | ||
32 | #define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/ | ||
33 | #define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */ | ||
34 | #define AC_BUS_ERROR 0x60000000 /* 34 Cleared on read, byte. */ | ||
35 | #define AC_SYNC_ERR 0x60000000 /* c fault type */ | ||
36 | #define AC_SYNC_VA 0x60000004 /* c fault virtual address */ | ||
37 | #define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */ | ||
38 | #define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */ | ||
39 | #define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */ | ||
40 | #define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */ | ||
41 | #define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */ | ||
42 | #define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */ | ||
43 | #define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */ | ||
44 | #define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/ | ||
45 | |||
46 | #define SUN3_PAGE_CHG_MASK (SUN3_PAGE_PGNUM_MASK \ | ||
47 | | SUN3_PAGE_ACCESSED | SUN3_PAGE_MODIFIED) | ||
48 | |||
49 | /* Bus access type within PTE. */ | ||
50 | #define SUN3_PAGE_TYPE_MASK (0x0c000000) | ||
51 | #define SUN3_PAGE_TYPE_MEMORY (0x00000000) | ||
52 | #define SUN3_PAGE_TYPE_IO (0x04000000) | ||
53 | #define SUN3_PAGE_TYPE_VME16 (0x08000000) | ||
54 | #define SUN3_PAGE_TYPE_VME32 (0x0c000000) | ||
55 | |||
56 | /* Mask for page number within PTE. */ | ||
57 | #define SUN3_PAGE_PGNUM_MASK (0x0007FFFF) | ||
58 | |||
59 | /* Bits within bus-error register. */ | ||
60 | #define SUN3_BUSERR_WATCHDOG (0x01) | ||
61 | #define SUN3_BUSERR_unused (0x02) | ||
62 | #define SUN3_BUSERR_FPAENERR (0x04) | ||
63 | #define SUN3_BUSERR_FPABERR (0x08) | ||
64 | #define SUN3_BUSERR_VMEBERR (0x10) | ||
65 | #define SUN3_BUSERR_TIMEOUT (0x20) | ||
66 | #define SUN3_BUSERR_PROTERR (0x40) | ||
67 | #define SUN3_BUSERR_INVALID (0x80) | ||
68 | |||
69 | #ifndef __ASSEMBLY__ | ||
70 | |||
71 | /* Read bus error status register (implicitly clearing it). */ | ||
72 | static inline unsigned char sun3_get_buserr(void) | ||
73 | { | ||
74 | unsigned char sfc, c; | ||
75 | |||
76 | GET_SFC (sfc); | ||
77 | SET_SFC (FC_CONTROL); | ||
78 | GET_CONTROL_BYTE (AC_BUS_ERROR, c); | ||
79 | SET_SFC (sfc); | ||
80 | |||
81 | return c; | ||
82 | } | ||
83 | |||
84 | /* Read segmap from hardware MMU. */ | ||
85 | static inline unsigned long sun3_get_segmap(unsigned long addr) | ||
86 | { | ||
87 | register unsigned long entry; | ||
88 | unsigned char c, sfc; | ||
89 | |||
90 | GET_SFC (sfc); | ||
91 | SET_SFC (FC_CONTROL); | ||
92 | GET_CONTROL_BYTE (AC_SEGMAP | (addr & SUN3_CONTROL_MASK), c); | ||
93 | SET_SFC (sfc); | ||
94 | entry = c; | ||
95 | |||
96 | return entry; | ||
97 | } | ||
98 | |||
99 | /* Write segmap to hardware MMU. */ | ||
100 | static inline void sun3_put_segmap(unsigned long addr, unsigned long entry) | ||
101 | { | ||
102 | unsigned char sfc; | ||
103 | |||
104 | GET_DFC (sfc); | ||
105 | SET_DFC (FC_CONTROL); | ||
106 | SET_CONTROL_BYTE (AC_SEGMAP | (addr & SUN3_CONTROL_MASK), entry); | ||
107 | SET_DFC (sfc); | ||
108 | |||
109 | return; | ||
110 | } | ||
111 | |||
112 | /* Read PTE from hardware MMU. */ | ||
113 | static inline unsigned long sun3_get_pte(unsigned long addr) | ||
114 | { | ||
115 | register unsigned long entry; | ||
116 | unsigned char sfc; | ||
117 | |||
118 | GET_SFC (sfc); | ||
119 | SET_SFC (FC_CONTROL); | ||
120 | GET_CONTROL_WORD (AC_PAGEMAP | (addr & SUN3_CONTROL_MASK), entry); | ||
121 | SET_SFC (sfc); | ||
122 | |||
123 | return entry; | ||
124 | } | ||
125 | |||
126 | /* Write PTE to hardware MMU. */ | ||
127 | static inline void sun3_put_pte(unsigned long addr, unsigned long entry) | ||
128 | { | ||
129 | unsigned char sfc; | ||
130 | |||
131 | GET_DFC (sfc); | ||
132 | SET_DFC (FC_CONTROL); | ||
133 | SET_CONTROL_WORD (AC_PAGEMAP | (addr & SUN3_CONTROL_MASK), entry); | ||
134 | SET_DFC (sfc); | ||
135 | |||
136 | return; | ||
137 | } | ||
138 | |||
139 | /* get current context */ | ||
140 | static inline unsigned char sun3_get_context(void) | ||
141 | { | ||
142 | unsigned char sfc, c; | ||
143 | |||
144 | GET_SFC(sfc); | ||
145 | SET_SFC(FC_CONTROL); | ||
146 | GET_CONTROL_BYTE(AC_CONTEXT, c); | ||
147 | SET_SFC(sfc); | ||
148 | |||
149 | return c; | ||
150 | } | ||
151 | |||
152 | /* set alternate context */ | ||
153 | static inline void sun3_put_context(unsigned char c) | ||
154 | { | ||
155 | unsigned char dfc; | ||
156 | GET_DFC(dfc); | ||
157 | SET_DFC(FC_CONTROL); | ||
158 | SET_CONTROL_BYTE(AC_CONTEXT, c); | ||
159 | SET_DFC(dfc); | ||
160 | |||
161 | return; | ||
162 | } | ||
163 | |||
164 | extern void __iomem *sun3_ioremap(unsigned long phys, unsigned long size, | ||
165 | unsigned long type); | ||
166 | |||
167 | extern int sun3_map_test(unsigned long addr, char *val); | ||
168 | |||
169 | #endif /* !__ASSEMBLY__ */ | ||
170 | |||
171 | #endif /* !__SUN3_MMU_H__ */ | ||
diff --git a/include/asm-m68k/sun3x.h b/include/asm-m68k/sun3x.h deleted file mode 100644 index f5691a1ed7cc..000000000000 --- a/include/asm-m68k/sun3x.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | #ifndef SUN3X_H | ||
2 | #define SUN3X_H | ||
3 | |||
4 | /* hardware addresses */ | ||
5 | #define SUN3X_IOMMU 0x60000000 | ||
6 | #define SUN3X_ENAREG 0x61000000 | ||
7 | #define SUN3X_INTREG 0x61001400 | ||
8 | #define SUN3X_DIAGREG 0x61001800 | ||
9 | #define SUN3X_ZS1 0x62000000 | ||
10 | #define SUN3X_ZS2 0x62002000 | ||
11 | #define SUN3X_LANCE 0x65002000 | ||
12 | #define SUN3X_EEPROM 0x64000000 | ||
13 | #define SUN3X_IDPROM 0x640007d8 | ||
14 | #define SUN3X_VIDEO_BASE 0x50000000 | ||
15 | #define SUN3X_VIDEO_P4ID 0x50300000 | ||
16 | #define SUN3X_ESP_BASE 0x66000000 | ||
17 | #define SUN3X_ESP_DMA 0x66001000 | ||
18 | #define SUN3X_FDC 0x6e000000 | ||
19 | #define SUN3X_FDC_FCR 0x6e000400 | ||
20 | #define SUN3X_FDC_FVR 0x6e000800 | ||
21 | |||
22 | /* some NVRAM addresses */ | ||
23 | #define SUN3X_EEPROM_CONS (SUN3X_EEPROM + 0x1f) | ||
24 | #define SUN3X_EEPROM_PORTA (SUN3X_EEPROM + 0x58) | ||
25 | #define SUN3X_EEPROM_PORTB (SUN3X_EEPROM + 0x60) | ||
26 | |||
27 | #endif | ||
diff --git a/include/asm-m68k/sun3xflop.h b/include/asm-m68k/sun3xflop.h deleted file mode 100644 index 32c45f84ac60..000000000000 --- a/include/asm-m68k/sun3xflop.h +++ /dev/null | |||
@@ -1,263 +0,0 @@ | |||
1 | /* sun3xflop.h: Sun3/80 specific parts of the floppy driver. | ||
2 | * | ||
3 | * Derived partially from asm-sparc/floppy.h, which is: | ||
4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | ||
5 | * | ||
6 | * Sun3x version 2/4/2000 Sam Creasey (sammy@sammy.net) | ||
7 | */ | ||
8 | |||
9 | #ifndef __ASM_SUN3X_FLOPPY_H | ||
10 | #define __ASM_SUN3X_FLOPPY_H | ||
11 | |||
12 | #include <asm/page.h> | ||
13 | #include <asm/pgtable.h> | ||
14 | #include <asm/system.h> | ||
15 | #include <asm/irq.h> | ||
16 | #include <asm/sun3x.h> | ||
17 | |||
18 | /* default interrupt vector */ | ||
19 | #define SUN3X_FDC_IRQ 0x40 | ||
20 | |||
21 | /* some constants */ | ||
22 | #define FCR_TC 0x1 | ||
23 | #define FCR_EJECT 0x2 | ||
24 | #define FCR_MTRON 0x4 | ||
25 | #define FCR_DSEL1 0x8 | ||
26 | #define FCR_DSEL0 0x10 | ||
27 | |||
28 | /* We don't need no stinkin' I/O port allocation crap. */ | ||
29 | #undef release_region | ||
30 | #undef request_region | ||
31 | #define release_region(X, Y) do { } while(0) | ||
32 | #define request_region(X, Y, Z) (1) | ||
33 | |||
34 | struct sun3xflop_private { | ||
35 | volatile unsigned char *status_r; | ||
36 | volatile unsigned char *data_r; | ||
37 | volatile unsigned char *fcr_r; | ||
38 | volatile unsigned char *fvr_r; | ||
39 | unsigned char fcr; | ||
40 | } sun3x_fdc; | ||
41 | |||
42 | /* Super paranoid... */ | ||
43 | #undef HAVE_DISABLE_HLT | ||
44 | |||
45 | /* Routines unique to each controller type on a Sun. */ | ||
46 | static unsigned char sun3x_82072_fd_inb(int port) | ||
47 | { | ||
48 | static int once = 0; | ||
49 | // udelay(5); | ||
50 | switch(port & 7) { | ||
51 | default: | ||
52 | printk("floppy: Asked to read unknown port %d\n", port); | ||
53 | panic("floppy: Port bolixed."); | ||
54 | case 4: /* FD_STATUS */ | ||
55 | return (*sun3x_fdc.status_r) & ~STATUS_DMA; | ||
56 | case 5: /* FD_DATA */ | ||
57 | return (*sun3x_fdc.data_r); | ||
58 | case 7: /* FD_DIR */ | ||
59 | /* ugly hack, I can't find a way to actually detect the disk */ | ||
60 | if(!once) { | ||
61 | once = 1; | ||
62 | return 0x80; | ||
63 | } | ||
64 | return 0; | ||
65 | }; | ||
66 | panic("sun_82072_fd_inb: How did I get here?"); | ||
67 | } | ||
68 | |||
69 | static void sun3x_82072_fd_outb(unsigned char value, int port) | ||
70 | { | ||
71 | // udelay(5); | ||
72 | switch(port & 7) { | ||
73 | default: | ||
74 | printk("floppy: Asked to write to unknown port %d\n", port); | ||
75 | panic("floppy: Port bolixed."); | ||
76 | case 2: /* FD_DOR */ | ||
77 | /* Oh geese, 82072 on the Sun has no DOR register, | ||
78 | * so we make do with taunting the FCR. | ||
79 | * | ||
80 | * ASSUMPTIONS: There will only ever be one floppy | ||
81 | * drive attached to a Sun controller | ||
82 | * and it will be at drive zero. | ||
83 | */ | ||
84 | |||
85 | { | ||
86 | unsigned char fcr = sun3x_fdc.fcr; | ||
87 | |||
88 | if(value & 0x10) { | ||
89 | fcr |= (FCR_DSEL0 | FCR_MTRON); | ||
90 | } else | ||
91 | fcr &= ~(FCR_DSEL0 | FCR_MTRON); | ||
92 | |||
93 | |||
94 | if(fcr != sun3x_fdc.fcr) { | ||
95 | *(sun3x_fdc.fcr_r) = fcr; | ||
96 | sun3x_fdc.fcr = fcr; | ||
97 | } | ||
98 | } | ||
99 | break; | ||
100 | case 5: /* FD_DATA */ | ||
101 | *(sun3x_fdc.data_r) = value; | ||
102 | break; | ||
103 | case 7: /* FD_DCR */ | ||
104 | *(sun3x_fdc.status_r) = value; | ||
105 | break; | ||
106 | case 4: /* FD_STATUS */ | ||
107 | *(sun3x_fdc.status_r) = value; | ||
108 | break; | ||
109 | }; | ||
110 | return; | ||
111 | } | ||
112 | |||
113 | |||
114 | asmlinkage irqreturn_t sun3xflop_hardint(int irq, void *dev_id) | ||
115 | { | ||
116 | register unsigned char st; | ||
117 | |||
118 | #undef TRACE_FLPY_INT | ||
119 | #define NO_FLOPPY_ASSEMBLER | ||
120 | |||
121 | #ifdef TRACE_FLPY_INT | ||
122 | static int calls=0; | ||
123 | static int bytes=0; | ||
124 | static int dma_wait=0; | ||
125 | #endif | ||
126 | if(!doing_pdma) { | ||
127 | floppy_interrupt(irq, dev_id); | ||
128 | return IRQ_HANDLED; | ||
129 | } | ||
130 | |||
131 | // printk("doing pdma\n");// st %x\n", sun_fdc->status_82072); | ||
132 | |||
133 | #ifdef TRACE_FLPY_INT | ||
134 | if(!calls) | ||
135 | bytes = virtual_dma_count; | ||
136 | #endif | ||
137 | |||
138 | { | ||
139 | register int lcount; | ||
140 | register char *lptr; | ||
141 | |||
142 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
143 | lcount; lcount--, lptr++) { | ||
144 | /* st=fd_inb(virtual_dma_port+4) & 0x80 ; */ | ||
145 | st = *(sun3x_fdc.status_r); | ||
146 | /* if(st != 0xa0) */ | ||
147 | /* break; */ | ||
148 | |||
149 | if((st & 0x80) == 0) { | ||
150 | virtual_dma_count = lcount; | ||
151 | virtual_dma_addr = lptr; | ||
152 | return IRQ_HANDLED; | ||
153 | } | ||
154 | |||
155 | if((st & 0x20) == 0) | ||
156 | break; | ||
157 | |||
158 | if(virtual_dma_mode) | ||
159 | /* fd_outb(*lptr, virtual_dma_port+5); */ | ||
160 | *(sun3x_fdc.data_r) = *lptr; | ||
161 | else | ||
162 | /* *lptr = fd_inb(virtual_dma_port+5); */ | ||
163 | *lptr = *(sun3x_fdc.data_r); | ||
164 | } | ||
165 | |||
166 | virtual_dma_count = lcount; | ||
167 | virtual_dma_addr = lptr; | ||
168 | /* st = fd_inb(virtual_dma_port+4); */ | ||
169 | st = *(sun3x_fdc.status_r); | ||
170 | } | ||
171 | |||
172 | #ifdef TRACE_FLPY_INT | ||
173 | calls++; | ||
174 | #endif | ||
175 | // printk("st=%02x\n", st); | ||
176 | if(st == 0x20) | ||
177 | return IRQ_HANDLED; | ||
178 | if(!(st & 0x20)) { | ||
179 | virtual_dma_residue += virtual_dma_count; | ||
180 | virtual_dma_count=0; | ||
181 | doing_pdma = 0; | ||
182 | |||
183 | #ifdef TRACE_FLPY_INT | ||
184 | printk("count=%x, residue=%x calls=%d bytes=%x dma_wait=%d\n", | ||
185 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
186 | dma_wait); | ||
187 | calls = 0; | ||
188 | dma_wait=0; | ||
189 | #endif | ||
190 | |||
191 | floppy_interrupt(irq, dev_id); | ||
192 | return IRQ_HANDLED; | ||
193 | } | ||
194 | |||
195 | |||
196 | #ifdef TRACE_FLPY_INT | ||
197 | if(!virtual_dma_count) | ||
198 | dma_wait++; | ||
199 | #endif | ||
200 | return IRQ_HANDLED; | ||
201 | } | ||
202 | |||
203 | static int sun3xflop_request_irq(void) | ||
204 | { | ||
205 | static int once = 0; | ||
206 | int error; | ||
207 | |||
208 | if(!once) { | ||
209 | once = 1; | ||
210 | error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, | ||
211 | IRQF_DISABLED, "floppy", NULL); | ||
212 | return ((error == 0) ? 0 : -1); | ||
213 | } else return 0; | ||
214 | } | ||
215 | |||
216 | static void __init floppy_set_flags(int *ints,int param, int param2); | ||
217 | |||
218 | static int sun3xflop_init(void) | ||
219 | { | ||
220 | if(FLOPPY_IRQ < 0x40) | ||
221 | FLOPPY_IRQ = SUN3X_FDC_IRQ; | ||
222 | |||
223 | sun3x_fdc.status_r = (volatile unsigned char *)SUN3X_FDC; | ||
224 | sun3x_fdc.data_r = (volatile unsigned char *)(SUN3X_FDC+1); | ||
225 | sun3x_fdc.fcr_r = (volatile unsigned char *)SUN3X_FDC_FCR; | ||
226 | sun3x_fdc.fvr_r = (volatile unsigned char *)SUN3X_FDC_FVR; | ||
227 | sun3x_fdc.fcr = 0; | ||
228 | |||
229 | /* Last minute sanity check... */ | ||
230 | if(*sun3x_fdc.status_r == 0xff) { | ||
231 | return -1; | ||
232 | } | ||
233 | |||
234 | *sun3x_fdc.fvr_r = FLOPPY_IRQ; | ||
235 | |||
236 | *sun3x_fdc.fcr_r = FCR_TC; | ||
237 | udelay(10); | ||
238 | *sun3x_fdc.fcr_r = 0; | ||
239 | |||
240 | /* Success... */ | ||
241 | floppy_set_flags(NULL, 1, FD_BROKEN_DCL); // I don't know how to detect this. | ||
242 | allowed_drive_mask = 0x01; | ||
243 | return (int) SUN3X_FDC; | ||
244 | } | ||
245 | |||
246 | /* I'm not precisely sure this eject routine works */ | ||
247 | static int sun3x_eject(void) | ||
248 | { | ||
249 | if(MACH_IS_SUN3X) { | ||
250 | |||
251 | sun3x_fdc.fcr |= (FCR_DSEL0 | FCR_EJECT); | ||
252 | *(sun3x_fdc.fcr_r) = sun3x_fdc.fcr; | ||
253 | udelay(10); | ||
254 | sun3x_fdc.fcr &= ~(FCR_DSEL0 | FCR_EJECT); | ||
255 | *(sun3x_fdc.fcr_r) = sun3x_fdc.fcr; | ||
256 | } | ||
257 | |||
258 | return 0; | ||
259 | } | ||
260 | |||
261 | #define fd_eject(drive) sun3x_eject() | ||
262 | |||
263 | #endif /* !(__ASM_SUN3X_FLOPPY_H) */ | ||
diff --git a/include/asm-m68k/sun3xprom.h b/include/asm-m68k/sun3xprom.h deleted file mode 100644 index 6735efcf5f6d..000000000000 --- a/include/asm-m68k/sun3xprom.h +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /* Useful PROM locations */ | ||
2 | |||
3 | #ifndef SUN3X_PROM_H | ||
4 | #define SUN3X_PROM_H | ||
5 | |||
6 | extern void (*sun3x_putchar)(int); | ||
7 | extern int (*sun3x_getchar)(void); | ||
8 | extern int (*sun3x_mayget)(void); | ||
9 | extern int (*sun3x_mayput)(int); | ||
10 | |||
11 | void sun3x_reboot(void); | ||
12 | void sun3x_abort(void); | ||
13 | void sun3x_prom_init(void); | ||
14 | unsigned long sun3x_prom_ptov(unsigned long pa, unsigned long size); | ||
15 | |||
16 | /* interesting hardware locations */ | ||
17 | #define SUN3X_IOMMU 0x60000000 | ||
18 | #define SUN3X_ENAREG 0x61000000 | ||
19 | #define SUN3X_INTREG 0x61001400 | ||
20 | #define SUN3X_DIAGREG 0x61001800 | ||
21 | #define SUN3X_ZS1 0x62000000 | ||
22 | #define SUN3X_ZS2 0x62002000 | ||
23 | #define SUN3X_LANCE 0x65002000 | ||
24 | #define SUN3X_EEPROM 0x64000000 | ||
25 | #define SUN3X_IDPROM 0x640007d8 | ||
26 | #define SUN3X_VIDEO_BASE 0x50400000 | ||
27 | #define SUN3X_VIDEO_REGS 0x50300000 | ||
28 | |||
29 | /* vector table */ | ||
30 | #define SUN3X_PROM_BASE 0xfefe0000 | ||
31 | #define SUN3X_P_GETCHAR (SUN3X_PROM_BASE + 20) | ||
32 | #define SUN3X_P_PUTCHAR (SUN3X_PROM_BASE + 24) | ||
33 | #define SUN3X_P_MAYGET (SUN3X_PROM_BASE + 28) | ||
34 | #define SUN3X_P_MAYPUT (SUN3X_PROM_BASE + 32) | ||
35 | #define SUN3X_P_REBOOT (SUN3X_PROM_BASE + 96) | ||
36 | #define SUN3X_P_SETLEDS (SUN3X_PROM_BASE + 144) | ||
37 | #define SUN3X_P_ABORT (SUN3X_PROM_BASE + 152) | ||
38 | |||
39 | /* mapped area */ | ||
40 | #define SUN3X_MAP_START 0xfee00000 | ||
41 | #define SUN3X_MAP_END 0xff000000 | ||
42 | |||
43 | #endif | ||
diff --git a/include/asm-m68k/suspend.h b/include/asm-m68k/suspend.h deleted file mode 100644 index 57b3ddb4d269..000000000000 --- a/include/asm-m68k/suspend.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _M68K_SUSPEND_H | ||
2 | #define _M68K_SUSPEND_H | ||
3 | |||
4 | /* Dummy include. */ | ||
5 | |||
6 | #endif /* _M68K_SUSPEND_H */ | ||
diff --git a/include/asm-m68k/swab.h b/include/asm-m68k/swab.h deleted file mode 100644 index 7221e3066825..000000000000 --- a/include/asm-m68k/swab.h +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #ifndef _M68K_SWAB_H | ||
2 | #define _M68K_SWAB_H | ||
3 | |||
4 | #include <asm/types.h> | ||
5 | #include <linux/compiler.h> | ||
6 | |||
7 | #define __SWAB_64_THRU_32__ | ||
8 | |||
9 | static inline __attribute_const__ __u32 __arch_swab32(__u32 val) | ||
10 | { | ||
11 | __asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val)); | ||
12 | return val; | ||
13 | } | ||
14 | #define __arch_swab32 __arch_swab32 | ||
15 | |||
16 | #endif /* _M68K_SWAB_H */ | ||
diff --git a/include/asm-m68k/system.h b/include/asm-m68k/system.h deleted file mode 100644 index dbb6515ffd5b..000000000000 --- a/include/asm-m68k/system.h +++ /dev/null | |||
@@ -1,218 +0,0 @@ | |||
1 | #ifndef _M68K_SYSTEM_H | ||
2 | #define _M68K_SYSTEM_H | ||
3 | |||
4 | #include <linux/linkage.h> | ||
5 | #include <linux/kernel.h> | ||
6 | #include <asm/segment.h> | ||
7 | #include <asm/entry.h> | ||
8 | |||
9 | #ifdef __KERNEL__ | ||
10 | |||
11 | /* | ||
12 | * switch_to(n) should switch tasks to task ptr, first checking that | ||
13 | * ptr isn't the current task, in which case it does nothing. This | ||
14 | * also clears the TS-flag if the task we switched to has used the | ||
15 | * math co-processor latest. | ||
16 | */ | ||
17 | /* | ||
18 | * switch_to() saves the extra registers, that are not saved | ||
19 | * automatically by SAVE_SWITCH_STACK in resume(), ie. d0-d5 and | ||
20 | * a0-a1. Some of these are used by schedule() and its predecessors | ||
21 | * and so we might get see unexpected behaviors when a task returns | ||
22 | * with unexpected register values. | ||
23 | * | ||
24 | * syscall stores these registers itself and none of them are used | ||
25 | * by syscall after the function in the syscall has been called. | ||
26 | * | ||
27 | * Beware that resume now expects *next to be in d1 and the offset of | ||
28 | * tss to be in a1. This saves a few instructions as we no longer have | ||
29 | * to push them onto the stack and read them back right after. | ||
30 | * | ||
31 | * 02/17/96 - Jes Sorensen (jds@kom.auc.dk) | ||
32 | * | ||
33 | * Changed 96/09/19 by Andreas Schwab | ||
34 | * pass prev in a0, next in a1 | ||
35 | */ | ||
36 | asmlinkage void resume(void); | ||
37 | #define switch_to(prev,next,last) do { \ | ||
38 | register void *_prev __asm__ ("a0") = (prev); \ | ||
39 | register void *_next __asm__ ("a1") = (next); \ | ||
40 | register void *_last __asm__ ("d1"); \ | ||
41 | __asm__ __volatile__("jbsr resume" \ | ||
42 | : "=a" (_prev), "=a" (_next), "=d" (_last) \ | ||
43 | : "0" (_prev), "1" (_next) \ | ||
44 | : "d0", "d2", "d3", "d4", "d5"); \ | ||
45 | (last) = _last; \ | ||
46 | } while (0) | ||
47 | |||
48 | |||
49 | /* | ||
50 | * Force strict CPU ordering. | ||
51 | * Not really required on m68k... | ||
52 | */ | ||
53 | #define nop() do { asm volatile ("nop"); barrier(); } while (0) | ||
54 | #define mb() barrier() | ||
55 | #define rmb() barrier() | ||
56 | #define wmb() barrier() | ||
57 | #define read_barrier_depends() ((void)0) | ||
58 | #define set_mb(var, value) ({ (var) = (value); wmb(); }) | ||
59 | |||
60 | #define smp_mb() barrier() | ||
61 | #define smp_rmb() barrier() | ||
62 | #define smp_wmb() barrier() | ||
63 | #define smp_read_barrier_depends() ((void)0) | ||
64 | |||
65 | /* interrupt control.. */ | ||
66 | #if 0 | ||
67 | #define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory") | ||
68 | #else | ||
69 | #include <linux/hardirq.h> | ||
70 | #define local_irq_enable() ({ \ | ||
71 | if (MACH_IS_Q40 || !hardirq_count()) \ | ||
72 | asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory"); \ | ||
73 | }) | ||
74 | #endif | ||
75 | #define local_irq_disable() asm volatile ("oriw #0x0700,%%sr": : : "memory") | ||
76 | #define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory") | ||
77 | #define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory") | ||
78 | |||
79 | static inline int irqs_disabled(void) | ||
80 | { | ||
81 | unsigned long flags; | ||
82 | local_save_flags(flags); | ||
83 | return flags & ~ALLOWINT; | ||
84 | } | ||
85 | |||
86 | /* For spinlocks etc */ | ||
87 | #define local_irq_save(x) ({ local_save_flags(x); local_irq_disable(); }) | ||
88 | |||
89 | #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) | ||
90 | |||
91 | struct __xchg_dummy { unsigned long a[100]; }; | ||
92 | #define __xg(x) ((volatile struct __xchg_dummy *)(x)) | ||
93 | |||
94 | #ifndef CONFIG_RMW_INSNS | ||
95 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | ||
96 | { | ||
97 | unsigned long flags, tmp; | ||
98 | |||
99 | local_irq_save(flags); | ||
100 | |||
101 | switch (size) { | ||
102 | case 1: | ||
103 | tmp = *(u8 *)ptr; | ||
104 | *(u8 *)ptr = x; | ||
105 | x = tmp; | ||
106 | break; | ||
107 | case 2: | ||
108 | tmp = *(u16 *)ptr; | ||
109 | *(u16 *)ptr = x; | ||
110 | x = tmp; | ||
111 | break; | ||
112 | case 4: | ||
113 | tmp = *(u32 *)ptr; | ||
114 | *(u32 *)ptr = x; | ||
115 | x = tmp; | ||
116 | break; | ||
117 | default: | ||
118 | BUG(); | ||
119 | } | ||
120 | |||
121 | local_irq_restore(flags); | ||
122 | return x; | ||
123 | } | ||
124 | #else | ||
125 | static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size) | ||
126 | { | ||
127 | switch (size) { | ||
128 | case 1: | ||
129 | __asm__ __volatile__ | ||
130 | ("moveb %2,%0\n\t" | ||
131 | "1:\n\t" | ||
132 | "casb %0,%1,%2\n\t" | ||
133 | "jne 1b" | ||
134 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | ||
135 | break; | ||
136 | case 2: | ||
137 | __asm__ __volatile__ | ||
138 | ("movew %2,%0\n\t" | ||
139 | "1:\n\t" | ||
140 | "casw %0,%1,%2\n\t" | ||
141 | "jne 1b" | ||
142 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | ||
143 | break; | ||
144 | case 4: | ||
145 | __asm__ __volatile__ | ||
146 | ("movel %2,%0\n\t" | ||
147 | "1:\n\t" | ||
148 | "casl %0,%1,%2\n\t" | ||
149 | "jne 1b" | ||
150 | : "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory"); | ||
151 | break; | ||
152 | } | ||
153 | return x; | ||
154 | } | ||
155 | #endif | ||
156 | |||
157 | #include <asm-generic/cmpxchg-local.h> | ||
158 | |||
159 | #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) | ||
160 | |||
161 | /* | ||
162 | * Atomic compare and exchange. Compare OLD with MEM, if identical, | ||
163 | * store NEW in MEM. Return the initial value in MEM. Success is | ||
164 | * indicated by comparing RETURN with OLD. | ||
165 | */ | ||
166 | #ifdef CONFIG_RMW_INSNS | ||
167 | #define __HAVE_ARCH_CMPXCHG 1 | ||
168 | |||
169 | static inline unsigned long __cmpxchg(volatile void *p, unsigned long old, | ||
170 | unsigned long new, int size) | ||
171 | { | ||
172 | switch (size) { | ||
173 | case 1: | ||
174 | __asm__ __volatile__ ("casb %0,%2,%1" | ||
175 | : "=d" (old), "=m" (*(char *)p) | ||
176 | : "d" (new), "0" (old), "m" (*(char *)p)); | ||
177 | break; | ||
178 | case 2: | ||
179 | __asm__ __volatile__ ("casw %0,%2,%1" | ||
180 | : "=d" (old), "=m" (*(short *)p) | ||
181 | : "d" (new), "0" (old), "m" (*(short *)p)); | ||
182 | break; | ||
183 | case 4: | ||
184 | __asm__ __volatile__ ("casl %0,%2,%1" | ||
185 | : "=d" (old), "=m" (*(int *)p) | ||
186 | : "d" (new), "0" (old), "m" (*(int *)p)); | ||
187 | break; | ||
188 | } | ||
189 | return old; | ||
190 | } | ||
191 | |||
192 | #define cmpxchg(ptr, o, n) \ | ||
193 | ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \ | ||
194 | (unsigned long)(n), sizeof(*(ptr)))) | ||
195 | #define cmpxchg_local(ptr, o, n) \ | ||
196 | ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \ | ||
197 | (unsigned long)(n), sizeof(*(ptr)))) | ||
198 | #else | ||
199 | |||
200 | /* | ||
201 | * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make | ||
202 | * them available. | ||
203 | */ | ||
204 | #define cmpxchg_local(ptr, o, n) \ | ||
205 | ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\ | ||
206 | (unsigned long)(n), sizeof(*(ptr)))) | ||
207 | |||
208 | #ifndef CONFIG_SMP | ||
209 | #include <asm-generic/cmpxchg.h> | ||
210 | #endif | ||
211 | |||
212 | #endif | ||
213 | |||
214 | #define arch_align_stack(x) (x) | ||
215 | |||
216 | #endif /* __KERNEL__ */ | ||
217 | |||
218 | #endif /* _M68K_SYSTEM_H */ | ||
diff --git a/include/asm-m68k/termbits.h b/include/asm-m68k/termbits.h deleted file mode 100644 index 8c14170996bb..000000000000 --- a/include/asm-m68k/termbits.h +++ /dev/null | |||
@@ -1,200 +0,0 @@ | |||
1 | #ifndef __ARCH_M68K_TERMBITS_H__ | ||
2 | #define __ARCH_M68K_TERMBITS_H__ | ||
3 | |||
4 | #include <linux/posix_types.h> | ||
5 | |||
6 | typedef unsigned char cc_t; | ||
7 | typedef unsigned int speed_t; | ||
8 | typedef unsigned int tcflag_t; | ||
9 | |||
10 | #define NCCS 19 | ||
11 | struct termios { | ||
12 | tcflag_t c_iflag; /* input mode flags */ | ||
13 | tcflag_t c_oflag; /* output mode flags */ | ||
14 | tcflag_t c_cflag; /* control mode flags */ | ||
15 | tcflag_t c_lflag; /* local mode flags */ | ||
16 | cc_t c_line; /* line discipline */ | ||
17 | cc_t c_cc[NCCS]; /* control characters */ | ||
18 | }; | ||
19 | |||
20 | struct termios2 { | ||
21 | tcflag_t c_iflag; /* input mode flags */ | ||
22 | tcflag_t c_oflag; /* output mode flags */ | ||
23 | tcflag_t c_cflag; /* control mode flags */ | ||
24 | tcflag_t c_lflag; /* local mode flags */ | ||
25 | cc_t c_line; /* line discipline */ | ||
26 | cc_t c_cc[NCCS]; /* control characters */ | ||
27 | speed_t c_ispeed; /* input speed */ | ||
28 | speed_t c_ospeed; /* output speed */ | ||
29 | }; | ||
30 | |||
31 | struct ktermios { | ||
32 | tcflag_t c_iflag; /* input mode flags */ | ||
33 | tcflag_t c_oflag; /* output mode flags */ | ||
34 | tcflag_t c_cflag; /* control mode flags */ | ||
35 | tcflag_t c_lflag; /* local mode flags */ | ||
36 | cc_t c_line; /* line discipline */ | ||
37 | cc_t c_cc[NCCS]; /* control characters */ | ||
38 | speed_t c_ispeed; /* input speed */ | ||
39 | speed_t c_ospeed; /* output speed */ | ||
40 | }; | ||
41 | |||
42 | /* c_cc characters */ | ||
43 | #define VINTR 0 | ||
44 | #define VQUIT 1 | ||
45 | #define VERASE 2 | ||
46 | #define VKILL 3 | ||
47 | #define VEOF 4 | ||
48 | #define VTIME 5 | ||
49 | #define VMIN 6 | ||
50 | #define VSWTC 7 | ||
51 | #define VSTART 8 | ||
52 | #define VSTOP 9 | ||
53 | #define VSUSP 10 | ||
54 | #define VEOL 11 | ||
55 | #define VREPRINT 12 | ||
56 | #define VDISCARD 13 | ||
57 | #define VWERASE 14 | ||
58 | #define VLNEXT 15 | ||
59 | #define VEOL2 16 | ||
60 | |||
61 | |||
62 | /* c_iflag bits */ | ||
63 | #define IGNBRK 0000001 | ||
64 | #define BRKINT 0000002 | ||
65 | #define IGNPAR 0000004 | ||
66 | #define PARMRK 0000010 | ||
67 | #define INPCK 0000020 | ||
68 | #define ISTRIP 0000040 | ||
69 | #define INLCR 0000100 | ||
70 | #define IGNCR 0000200 | ||
71 | #define ICRNL 0000400 | ||
72 | #define IUCLC 0001000 | ||
73 | #define IXON 0002000 | ||
74 | #define IXANY 0004000 | ||
75 | #define IXOFF 0010000 | ||
76 | #define IMAXBEL 0020000 | ||
77 | #define IUTF8 0040000 | ||
78 | |||
79 | /* c_oflag bits */ | ||
80 | #define OPOST 0000001 | ||
81 | #define OLCUC 0000002 | ||
82 | #define ONLCR 0000004 | ||
83 | #define OCRNL 0000010 | ||
84 | #define ONOCR 0000020 | ||
85 | #define ONLRET 0000040 | ||
86 | #define OFILL 0000100 | ||
87 | #define OFDEL 0000200 | ||
88 | #define NLDLY 0000400 | ||
89 | #define NL0 0000000 | ||
90 | #define NL1 0000400 | ||
91 | #define CRDLY 0003000 | ||
92 | #define CR0 0000000 | ||
93 | #define CR1 0001000 | ||
94 | #define CR2 0002000 | ||
95 | #define CR3 0003000 | ||
96 | #define TABDLY 0014000 | ||
97 | #define TAB0 0000000 | ||
98 | #define TAB1 0004000 | ||
99 | #define TAB2 0010000 | ||
100 | #define TAB3 0014000 | ||
101 | #define XTABS 0014000 | ||
102 | #define BSDLY 0020000 | ||
103 | #define BS0 0000000 | ||
104 | #define BS1 0020000 | ||
105 | #define VTDLY 0040000 | ||
106 | #define VT0 0000000 | ||
107 | #define VT1 0040000 | ||
108 | #define FFDLY 0100000 | ||
109 | #define FF0 0000000 | ||
110 | #define FF1 0100000 | ||
111 | |||
112 | /* c_cflag bit meaning */ | ||
113 | #define CBAUD 0010017 | ||
114 | #define B0 0000000 /* hang up */ | ||
115 | #define B50 0000001 | ||
116 | #define B75 0000002 | ||
117 | #define B110 0000003 | ||
118 | #define B134 0000004 | ||
119 | #define B150 0000005 | ||
120 | #define B200 0000006 | ||
121 | #define B300 0000007 | ||
122 | #define B600 0000010 | ||
123 | #define B1200 0000011 | ||
124 | #define B1800 0000012 | ||
125 | #define B2400 0000013 | ||
126 | #define B4800 0000014 | ||
127 | #define B9600 0000015 | ||
128 | #define B19200 0000016 | ||
129 | #define B38400 0000017 | ||
130 | #define EXTA B19200 | ||
131 | #define EXTB B38400 | ||
132 | #define CSIZE 0000060 | ||
133 | #define CS5 0000000 | ||
134 | #define CS6 0000020 | ||
135 | #define CS7 0000040 | ||
136 | #define CS8 0000060 | ||
137 | #define CSTOPB 0000100 | ||
138 | #define CREAD 0000200 | ||
139 | #define PARENB 0000400 | ||
140 | #define PARODD 0001000 | ||
141 | #define HUPCL 0002000 | ||
142 | #define CLOCAL 0004000 | ||
143 | #define CBAUDEX 0010000 | ||
144 | #define BOTHER 0010000 | ||
145 | #define B57600 0010001 | ||
146 | #define B115200 0010002 | ||
147 | #define B230400 0010003 | ||
148 | #define B460800 0010004 | ||
149 | #define B500000 0010005 | ||
150 | #define B576000 0010006 | ||
151 | #define B921600 0010007 | ||
152 | #define B1000000 0010010 | ||
153 | #define B1152000 0010011 | ||
154 | #define B1500000 0010012 | ||
155 | #define B2000000 0010013 | ||
156 | #define B2500000 0010014 | ||
157 | #define B3000000 0010015 | ||
158 | #define B3500000 0010016 | ||
159 | #define B4000000 0010017 | ||
160 | #define CIBAUD 002003600000 /* input baud rate */ | ||
161 | #define CMSPAR 010000000000 /* mark or space (stick) parity */ | ||
162 | #define CRTSCTS 020000000000 /* flow control */ | ||
163 | |||
164 | #define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */ | ||
165 | |||
166 | /* c_lflag bits */ | ||
167 | #define ISIG 0000001 | ||
168 | #define ICANON 0000002 | ||
169 | #define XCASE 0000004 | ||
170 | #define ECHO 0000010 | ||
171 | #define ECHOE 0000020 | ||
172 | #define ECHOK 0000040 | ||
173 | #define ECHONL 0000100 | ||
174 | #define NOFLSH 0000200 | ||
175 | #define TOSTOP 0000400 | ||
176 | #define ECHOCTL 0001000 | ||
177 | #define ECHOPRT 0002000 | ||
178 | #define ECHOKE 0004000 | ||
179 | #define FLUSHO 0010000 | ||
180 | #define PENDIN 0040000 | ||
181 | #define IEXTEN 0100000 | ||
182 | |||
183 | |||
184 | /* tcflow() and TCXONC use these */ | ||
185 | #define TCOOFF 0 | ||
186 | #define TCOON 1 | ||
187 | #define TCIOFF 2 | ||
188 | #define TCION 3 | ||
189 | |||
190 | /* tcflush() and TCFLSH use these */ | ||
191 | #define TCIFLUSH 0 | ||
192 | #define TCOFLUSH 1 | ||
193 | #define TCIOFLUSH 2 | ||
194 | |||
195 | /* tcsetattr uses these */ | ||
196 | #define TCSANOW 0 | ||
197 | #define TCSADRAIN 1 | ||
198 | #define TCSAFLUSH 2 | ||
199 | |||
200 | #endif /* __ARCH_M68K_TERMBITS_H__ */ | ||
diff --git a/include/asm-m68k/termios.h b/include/asm-m68k/termios.h deleted file mode 100644 index 0823032e4045..000000000000 --- a/include/asm-m68k/termios.h +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | #ifndef _M68K_TERMIOS_H | ||
2 | #define _M68K_TERMIOS_H | ||
3 | |||
4 | #include <asm/termbits.h> | ||
5 | #include <asm/ioctls.h> | ||
6 | |||
7 | struct winsize { | ||
8 | unsigned short ws_row; | ||
9 | unsigned short ws_col; | ||
10 | unsigned short ws_xpixel; | ||
11 | unsigned short ws_ypixel; | ||
12 | }; | ||
13 | |||
14 | #define NCC 8 | ||
15 | struct termio { | ||
16 | unsigned short c_iflag; /* input mode flags */ | ||
17 | unsigned short c_oflag; /* output mode flags */ | ||
18 | unsigned short c_cflag; /* control mode flags */ | ||
19 | unsigned short c_lflag; /* local mode flags */ | ||
20 | unsigned char c_line; /* line discipline */ | ||
21 | unsigned char c_cc[NCC]; /* control characters */ | ||
22 | }; | ||
23 | |||
24 | #ifdef __KERNEL__ | ||
25 | /* intr=^C quit=^| erase=del kill=^U | ||
26 | eof=^D vtime=\0 vmin=\1 sxtc=\0 | ||
27 | start=^Q stop=^S susp=^Z eol=\0 | ||
28 | reprint=^R discard=^U werase=^W lnext=^V | ||
29 | eol2=\0 | ||
30 | */ | ||
31 | #define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0" | ||
32 | #endif | ||
33 | |||
34 | /* modem lines */ | ||
35 | #define TIOCM_LE 0x001 | ||
36 | #define TIOCM_DTR 0x002 | ||
37 | #define TIOCM_RTS 0x004 | ||
38 | #define TIOCM_ST 0x008 | ||
39 | #define TIOCM_SR 0x010 | ||
40 | #define TIOCM_CTS 0x020 | ||
41 | #define TIOCM_CAR 0x040 | ||
42 | #define TIOCM_RNG 0x080 | ||
43 | #define TIOCM_DSR 0x100 | ||
44 | #define TIOCM_CD TIOCM_CAR | ||
45 | #define TIOCM_RI TIOCM_RNG | ||
46 | #define TIOCM_OUT1 0x2000 | ||
47 | #define TIOCM_OUT2 0x4000 | ||
48 | #define TIOCM_LOOP 0x8000 | ||
49 | |||
50 | /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ | ||
51 | |||
52 | #ifdef __KERNEL__ | ||
53 | |||
54 | /* | ||
55 | * Translate a "termio" structure into a "termios". Ugh. | ||
56 | */ | ||
57 | #define user_termio_to_kernel_termios(termios, termio) \ | ||
58 | ({ \ | ||
59 | unsigned short tmp; \ | ||
60 | get_user(tmp, &(termio)->c_iflag); \ | ||
61 | (termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \ | ||
62 | get_user(tmp, &(termio)->c_oflag); \ | ||
63 | (termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \ | ||
64 | get_user(tmp, &(termio)->c_cflag); \ | ||
65 | (termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \ | ||
66 | get_user(tmp, &(termio)->c_lflag); \ | ||
67 | (termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \ | ||
68 | get_user((termios)->c_line, &(termio)->c_line); \ | ||
69 | copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \ | ||
70 | }) | ||
71 | |||
72 | /* | ||
73 | * Translate a "termios" structure into a "termio". Ugh. | ||
74 | */ | ||
75 | #define kernel_termios_to_user_termio(termio, termios) \ | ||
76 | ({ \ | ||
77 | put_user((termios)->c_iflag, &(termio)->c_iflag); \ | ||
78 | put_user((termios)->c_oflag, &(termio)->c_oflag); \ | ||
79 | put_user((termios)->c_cflag, &(termio)->c_cflag); \ | ||
80 | put_user((termios)->c_lflag, &(termio)->c_lflag); \ | ||
81 | put_user((termios)->c_line, &(termio)->c_line); \ | ||
82 | copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \ | ||
83 | }) | ||
84 | |||
85 | #define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2)) | ||
86 | #define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2)) | ||
87 | #define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios)) | ||
88 | #define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios)) | ||
89 | |||
90 | #endif /* __KERNEL__ */ | ||
91 | |||
92 | #endif /* _M68K_TERMIOS_H */ | ||
diff --git a/include/asm-m68k/thread_info.h b/include/asm-m68k/thread_info.h deleted file mode 100644 index af0fda46e94b..000000000000 --- a/include/asm-m68k/thread_info.h +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_THREAD_INFO_H | ||
2 | #define _ASM_M68K_THREAD_INFO_H | ||
3 | |||
4 | #include <asm/types.h> | ||
5 | #include <asm/page.h> | ||
6 | |||
7 | struct thread_info { | ||
8 | struct task_struct *task; /* main task structure */ | ||
9 | unsigned long flags; | ||
10 | struct exec_domain *exec_domain; /* execution domain */ | ||
11 | int preempt_count; /* 0 => preemptable, <0 => BUG */ | ||
12 | __u32 cpu; /* should always be 0 on m68k */ | ||
13 | struct restart_block restart_block; | ||
14 | }; | ||
15 | |||
16 | #define PREEMPT_ACTIVE 0x4000000 | ||
17 | |||
18 | #define INIT_THREAD_INFO(tsk) \ | ||
19 | { \ | ||
20 | .task = &tsk, \ | ||
21 | .exec_domain = &default_exec_domain, \ | ||
22 | .restart_block = { \ | ||
23 | .fn = do_no_restart_syscall, \ | ||
24 | }, \ | ||
25 | } | ||
26 | |||
27 | /* THREAD_SIZE should be 8k, so handle differently for 4k and 8k machines */ | ||
28 | #define THREAD_SIZE_ORDER (13 - PAGE_SHIFT) | ||
29 | |||
30 | #define init_thread_info (init_task.thread.info) | ||
31 | #define init_stack (init_thread_union.stack) | ||
32 | |||
33 | #define task_thread_info(tsk) (&(tsk)->thread.info) | ||
34 | #define task_stack_page(tsk) ((tsk)->stack) | ||
35 | #define current_thread_info() task_thread_info(current) | ||
36 | |||
37 | #define __HAVE_THREAD_FUNCTIONS | ||
38 | |||
39 | #define setup_thread_stack(p, org) ({ \ | ||
40 | *(struct task_struct **)(p)->stack = (p); \ | ||
41 | task_thread_info(p)->task = (p); \ | ||
42 | }) | ||
43 | |||
44 | #define end_of_stack(p) ((unsigned long *)(p)->stack + 1) | ||
45 | |||
46 | /* entry.S relies on these definitions! | ||
47 | * bits 0-7 are tested at every exception exit | ||
48 | * bits 8-15 are also tested at syscall exit | ||
49 | */ | ||
50 | #define TIF_SIGPENDING 6 /* signal pending */ | ||
51 | #define TIF_NEED_RESCHED 7 /* rescheduling necessary */ | ||
52 | #define TIF_DELAYED_TRACE 14 /* single step a syscall */ | ||
53 | #define TIF_SYSCALL_TRACE 15 /* syscall trace active */ | ||
54 | #define TIF_MEMDIE 16 | ||
55 | #define TIF_FREEZE 17 /* thread is freezing for suspend */ | ||
56 | |||
57 | #endif /* _ASM_M68K_THREAD_INFO_H */ | ||
diff --git a/include/asm-m68k/timex.h b/include/asm-m68k/timex.h deleted file mode 100644 index b87f2f278f67..000000000000 --- a/include/asm-m68k/timex.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-m68k/timex.h | ||
3 | * | ||
4 | * m68k architecture timex specifications | ||
5 | */ | ||
6 | #ifndef _ASMm68k_TIMEX_H | ||
7 | #define _ASMm68k_TIMEX_H | ||
8 | |||
9 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | ||
10 | |||
11 | typedef unsigned long cycles_t; | ||
12 | |||
13 | static inline cycles_t get_cycles(void) | ||
14 | { | ||
15 | return 0; | ||
16 | } | ||
17 | |||
18 | #endif | ||
diff --git a/include/asm-m68k/tlb.h b/include/asm-m68k/tlb.h deleted file mode 100644 index 1785cff73449..000000000000 --- a/include/asm-m68k/tlb.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef _M68K_TLB_H | ||
2 | #define _M68K_TLB_H | ||
3 | |||
4 | /* | ||
5 | * m68k doesn't need any special per-pte or | ||
6 | * per-vma handling.. | ||
7 | */ | ||
8 | #define tlb_start_vma(tlb, vma) do { } while (0) | ||
9 | #define tlb_end_vma(tlb, vma) do { } while (0) | ||
10 | #define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0) | ||
11 | |||
12 | /* | ||
13 | * .. because we flush the whole mm when it | ||
14 | * fills up. | ||
15 | */ | ||
16 | #define tlb_flush(tlb) flush_tlb_mm((tlb)->mm) | ||
17 | |||
18 | #include <asm-generic/tlb.h> | ||
19 | |||
20 | #endif /* _M68K_TLB_H */ | ||
diff --git a/include/asm-m68k/tlbflush.h b/include/asm-m68k/tlbflush.h deleted file mode 100644 index acb6bf21a321..000000000000 --- a/include/asm-m68k/tlbflush.h +++ /dev/null | |||
@@ -1,219 +0,0 @@ | |||
1 | #ifndef _M68K_TLBFLUSH_H | ||
2 | #define _M68K_TLBFLUSH_H | ||
3 | |||
4 | |||
5 | #ifndef CONFIG_SUN3 | ||
6 | |||
7 | #include <asm/current.h> | ||
8 | |||
9 | static inline void flush_tlb_kernel_page(void *addr) | ||
10 | { | ||
11 | if (CPU_IS_040_OR_060) { | ||
12 | mm_segment_t old_fs = get_fs(); | ||
13 | set_fs(KERNEL_DS); | ||
14 | __asm__ __volatile__(".chip 68040\n\t" | ||
15 | "pflush (%0)\n\t" | ||
16 | ".chip 68k" | ||
17 | : : "a" (addr)); | ||
18 | set_fs(old_fs); | ||
19 | } else if (CPU_IS_020_OR_030) | ||
20 | __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr)); | ||
21 | } | ||
22 | |||
23 | /* | ||
24 | * flush all user-space atc entries. | ||
25 | */ | ||
26 | static inline void __flush_tlb(void) | ||
27 | { | ||
28 | if (CPU_IS_040_OR_060) | ||
29 | __asm__ __volatile__(".chip 68040\n\t" | ||
30 | "pflushan\n\t" | ||
31 | ".chip 68k"); | ||
32 | else if (CPU_IS_020_OR_030) | ||
33 | __asm__ __volatile__("pflush #0,#4"); | ||
34 | } | ||
35 | |||
36 | static inline void __flush_tlb040_one(unsigned long addr) | ||
37 | { | ||
38 | __asm__ __volatile__(".chip 68040\n\t" | ||
39 | "pflush (%0)\n\t" | ||
40 | ".chip 68k" | ||
41 | : : "a" (addr)); | ||
42 | } | ||
43 | |||
44 | static inline void __flush_tlb_one(unsigned long addr) | ||
45 | { | ||
46 | if (CPU_IS_040_OR_060) | ||
47 | __flush_tlb040_one(addr); | ||
48 | else if (CPU_IS_020_OR_030) | ||
49 | __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr)); | ||
50 | } | ||
51 | |||
52 | #define flush_tlb() __flush_tlb() | ||
53 | |||
54 | /* | ||
55 | * flush all atc entries (both kernel and user-space entries). | ||
56 | */ | ||
57 | static inline void flush_tlb_all(void) | ||
58 | { | ||
59 | if (CPU_IS_040_OR_060) | ||
60 | __asm__ __volatile__(".chip 68040\n\t" | ||
61 | "pflusha\n\t" | ||
62 | ".chip 68k"); | ||
63 | else if (CPU_IS_020_OR_030) | ||
64 | __asm__ __volatile__("pflusha"); | ||
65 | } | ||
66 | |||
67 | static inline void flush_tlb_mm(struct mm_struct *mm) | ||
68 | { | ||
69 | if (mm == current->active_mm) | ||
70 | __flush_tlb(); | ||
71 | } | ||
72 | |||
73 | static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) | ||
74 | { | ||
75 | if (vma->vm_mm == current->active_mm) { | ||
76 | mm_segment_t old_fs = get_fs(); | ||
77 | set_fs(USER_DS); | ||
78 | __flush_tlb_one(addr); | ||
79 | set_fs(old_fs); | ||
80 | } | ||
81 | } | ||
82 | |||
83 | static inline void flush_tlb_range(struct vm_area_struct *vma, | ||
84 | unsigned long start, unsigned long end) | ||
85 | { | ||
86 | if (vma->vm_mm == current->active_mm) | ||
87 | __flush_tlb(); | ||
88 | } | ||
89 | |||
90 | static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end) | ||
91 | { | ||
92 | flush_tlb_all(); | ||
93 | } | ||
94 | |||
95 | #else | ||
96 | |||
97 | |||
98 | /* Reserved PMEGs. */ | ||
99 | extern char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; | ||
100 | extern unsigned long pmeg_vaddr[SUN3_PMEGS_NUM]; | ||
101 | extern unsigned char pmeg_alloc[SUN3_PMEGS_NUM]; | ||
102 | extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM]; | ||
103 | |||
104 | /* Flush all userspace mappings one by one... (why no flush command, | ||
105 | sun?) */ | ||
106 | static inline void flush_tlb_all(void) | ||
107 | { | ||
108 | unsigned long addr; | ||
109 | unsigned char ctx, oldctx; | ||
110 | |||
111 | oldctx = sun3_get_context(); | ||
112 | for(addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) { | ||
113 | for(ctx = 0; ctx < 8; ctx++) { | ||
114 | sun3_put_context(ctx); | ||
115 | sun3_put_segmap(addr, SUN3_INVALID_PMEG); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | sun3_put_context(oldctx); | ||
120 | /* erase all of the userspace pmeg maps, we've clobbered them | ||
121 | all anyway */ | ||
122 | for(addr = 0; addr < SUN3_INVALID_PMEG; addr++) { | ||
123 | if(pmeg_alloc[addr] == 1) { | ||
124 | pmeg_alloc[addr] = 0; | ||
125 | pmeg_ctx[addr] = 0; | ||
126 | pmeg_vaddr[addr] = 0; | ||
127 | } | ||
128 | } | ||
129 | |||
130 | } | ||
131 | |||
132 | /* Clear user TLB entries within the context named in mm */ | ||
133 | static inline void flush_tlb_mm (struct mm_struct *mm) | ||
134 | { | ||
135 | unsigned char oldctx; | ||
136 | unsigned char seg; | ||
137 | unsigned long i; | ||
138 | |||
139 | oldctx = sun3_get_context(); | ||
140 | sun3_put_context(mm->context); | ||
141 | |||
142 | for(i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) { | ||
143 | seg = sun3_get_segmap(i); | ||
144 | if(seg == SUN3_INVALID_PMEG) | ||
145 | continue; | ||
146 | |||
147 | sun3_put_segmap(i, SUN3_INVALID_PMEG); | ||
148 | pmeg_alloc[seg] = 0; | ||
149 | pmeg_ctx[seg] = 0; | ||
150 | pmeg_vaddr[seg] = 0; | ||
151 | } | ||
152 | |||
153 | sun3_put_context(oldctx); | ||
154 | |||
155 | } | ||
156 | |||
157 | /* Flush a single TLB page. In this case, we're limited to flushing a | ||
158 | single PMEG */ | ||
159 | static inline void flush_tlb_page (struct vm_area_struct *vma, | ||
160 | unsigned long addr) | ||
161 | { | ||
162 | unsigned char oldctx; | ||
163 | unsigned char i; | ||
164 | |||
165 | oldctx = sun3_get_context(); | ||
166 | sun3_put_context(vma->vm_mm->context); | ||
167 | addr &= ~SUN3_PMEG_MASK; | ||
168 | if((i = sun3_get_segmap(addr)) != SUN3_INVALID_PMEG) | ||
169 | { | ||
170 | pmeg_alloc[i] = 0; | ||
171 | pmeg_ctx[i] = 0; | ||
172 | pmeg_vaddr[i] = 0; | ||
173 | sun3_put_segmap (addr, SUN3_INVALID_PMEG); | ||
174 | } | ||
175 | sun3_put_context(oldctx); | ||
176 | |||
177 | } | ||
178 | /* Flush a range of pages from TLB. */ | ||
179 | |||
180 | static inline void flush_tlb_range (struct vm_area_struct *vma, | ||
181 | unsigned long start, unsigned long end) | ||
182 | { | ||
183 | struct mm_struct *mm = vma->vm_mm; | ||
184 | unsigned char seg, oldctx; | ||
185 | |||
186 | start &= ~SUN3_PMEG_MASK; | ||
187 | |||
188 | oldctx = sun3_get_context(); | ||
189 | sun3_put_context(mm->context); | ||
190 | |||
191 | while(start < end) | ||
192 | { | ||
193 | if((seg = sun3_get_segmap(start)) == SUN3_INVALID_PMEG) | ||
194 | goto next; | ||
195 | if(pmeg_ctx[seg] == mm->context) { | ||
196 | pmeg_alloc[seg] = 0; | ||
197 | pmeg_ctx[seg] = 0; | ||
198 | pmeg_vaddr[seg] = 0; | ||
199 | } | ||
200 | sun3_put_segmap(start, SUN3_INVALID_PMEG); | ||
201 | next: | ||
202 | start += SUN3_PMEG_SIZE; | ||
203 | } | ||
204 | } | ||
205 | |||
206 | static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end) | ||
207 | { | ||
208 | flush_tlb_all(); | ||
209 | } | ||
210 | |||
211 | /* Flush kernel page from TLB. */ | ||
212 | static inline void flush_tlb_kernel_page (unsigned long addr) | ||
213 | { | ||
214 | sun3_put_segmap (addr & ~(SUN3_PMEG_SIZE - 1), SUN3_INVALID_PMEG); | ||
215 | } | ||
216 | |||
217 | #endif | ||
218 | |||
219 | #endif /* _M68K_TLBFLUSH_H */ | ||
diff --git a/include/asm-m68k/topology.h b/include/asm-m68k/topology.h deleted file mode 100644 index ca173e9f26ff..000000000000 --- a/include/asm-m68k/topology.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_TOPOLOGY_H | ||
2 | #define _ASM_M68K_TOPOLOGY_H | ||
3 | |||
4 | #include <asm-generic/topology.h> | ||
5 | |||
6 | #endif /* _ASM_M68K_TOPOLOGY_H */ | ||
diff --git a/include/asm-m68k/traps.h b/include/asm-m68k/traps.h deleted file mode 100644 index 8caef25624c7..000000000000 --- a/include/asm-m68k/traps.h +++ /dev/null | |||
@@ -1,272 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm/traps.h | ||
3 | * | ||
4 | * Copyright (C) 1993 Hamish Macdonald | ||
5 | * | ||
6 | * This file is subject to the terms and conditions of the GNU General Public | ||
7 | * License. See the file COPYING in the main directory of this archive | ||
8 | * for more details. | ||
9 | */ | ||
10 | |||
11 | #ifndef _M68K_TRAPS_H | ||
12 | #define _M68K_TRAPS_H | ||
13 | |||
14 | #ifndef __ASSEMBLY__ | ||
15 | |||
16 | #include <linux/linkage.h> | ||
17 | #include <asm/ptrace.h> | ||
18 | |||
19 | typedef void (*e_vector)(void); | ||
20 | |||
21 | asmlinkage void auto_inthandler(void); | ||
22 | asmlinkage void user_inthandler(void); | ||
23 | asmlinkage void bad_inthandler(void); | ||
24 | |||
25 | extern e_vector vectors[]; | ||
26 | |||
27 | #endif | ||
28 | |||
29 | #define VEC_RESETSP (0) | ||
30 | #define VEC_RESETPC (1) | ||
31 | #define VEC_BUSERR (2) | ||
32 | #define VEC_ADDRERR (3) | ||
33 | #define VEC_ILLEGAL (4) | ||
34 | #define VEC_ZERODIV (5) | ||
35 | #define VEC_CHK (6) | ||
36 | #define VEC_TRAP (7) | ||
37 | #define VEC_PRIV (8) | ||
38 | #define VEC_TRACE (9) | ||
39 | #define VEC_LINE10 (10) | ||
40 | #define VEC_LINE11 (11) | ||
41 | #define VEC_RESV12 (12) | ||
42 | #define VEC_COPROC (13) | ||
43 | #define VEC_FORMAT (14) | ||
44 | #define VEC_UNINT (15) | ||
45 | #define VEC_RESV16 (16) | ||
46 | #define VEC_RESV17 (17) | ||
47 | #define VEC_RESV18 (18) | ||
48 | #define VEC_RESV19 (19) | ||
49 | #define VEC_RESV20 (20) | ||
50 | #define VEC_RESV21 (21) | ||
51 | #define VEC_RESV22 (22) | ||
52 | #define VEC_RESV23 (23) | ||
53 | #define VEC_SPUR (24) | ||
54 | #define VEC_INT1 (25) | ||
55 | #define VEC_INT2 (26) | ||
56 | #define VEC_INT3 (27) | ||
57 | #define VEC_INT4 (28) | ||
58 | #define VEC_INT5 (29) | ||
59 | #define VEC_INT6 (30) | ||
60 | #define VEC_INT7 (31) | ||
61 | #define VEC_SYS (32) | ||
62 | #define VEC_TRAP1 (33) | ||
63 | #define VEC_TRAP2 (34) | ||
64 | #define VEC_TRAP3 (35) | ||
65 | #define VEC_TRAP4 (36) | ||
66 | #define VEC_TRAP5 (37) | ||
67 | #define VEC_TRAP6 (38) | ||
68 | #define VEC_TRAP7 (39) | ||
69 | #define VEC_TRAP8 (40) | ||
70 | #define VEC_TRAP9 (41) | ||
71 | #define VEC_TRAP10 (42) | ||
72 | #define VEC_TRAP11 (43) | ||
73 | #define VEC_TRAP12 (44) | ||
74 | #define VEC_TRAP13 (45) | ||
75 | #define VEC_TRAP14 (46) | ||
76 | #define VEC_TRAP15 (47) | ||
77 | #define VEC_FPBRUC (48) | ||
78 | #define VEC_FPIR (49) | ||
79 | #define VEC_FPDIVZ (50) | ||
80 | #define VEC_FPUNDER (51) | ||
81 | #define VEC_FPOE (52) | ||
82 | #define VEC_FPOVER (53) | ||
83 | #define VEC_FPNAN (54) | ||
84 | #define VEC_FPUNSUP (55) | ||
85 | #define VEC_MMUCFG (56) | ||
86 | #define VEC_MMUILL (57) | ||
87 | #define VEC_MMUACC (58) | ||
88 | #define VEC_RESV59 (59) | ||
89 | #define VEC_UNIMPEA (60) | ||
90 | #define VEC_UNIMPII (61) | ||
91 | #define VEC_RESV62 (62) | ||
92 | #define VEC_RESV63 (63) | ||
93 | #define VEC_USER (64) | ||
94 | |||
95 | #define VECOFF(vec) ((vec)<<2) | ||
96 | |||
97 | #ifndef __ASSEMBLY__ | ||
98 | |||
99 | /* Status register bits */ | ||
100 | #define PS_T (0x8000) | ||
101 | #define PS_S (0x2000) | ||
102 | #define PS_M (0x1000) | ||
103 | #define PS_C (0x0001) | ||
104 | |||
105 | /* bits for 68020/68030 special status word */ | ||
106 | |||
107 | #define FC (0x8000) | ||
108 | #define FB (0x4000) | ||
109 | #define RC (0x2000) | ||
110 | #define RB (0x1000) | ||
111 | #define DF (0x0100) | ||
112 | #define RM (0x0080) | ||
113 | #define RW (0x0040) | ||
114 | #define SZ (0x0030) | ||
115 | #define DFC (0x0007) | ||
116 | |||
117 | /* bits for 68030 MMU status register (mmusr,psr) */ | ||
118 | |||
119 | #define MMU_B (0x8000) /* bus error */ | ||
120 | #define MMU_L (0x4000) /* limit violation */ | ||
121 | #define MMU_S (0x2000) /* supervisor violation */ | ||
122 | #define MMU_WP (0x0800) /* write-protected */ | ||
123 | #define MMU_I (0x0400) /* invalid descriptor */ | ||
124 | #define MMU_M (0x0200) /* ATC entry modified */ | ||
125 | #define MMU_T (0x0040) /* transparent translation */ | ||
126 | #define MMU_NUM (0x0007) /* number of levels traversed */ | ||
127 | |||
128 | |||
129 | /* bits for 68040 special status word */ | ||
130 | #define CP_040 (0x8000) | ||
131 | #define CU_040 (0x4000) | ||
132 | #define CT_040 (0x2000) | ||
133 | #define CM_040 (0x1000) | ||
134 | #define MA_040 (0x0800) | ||
135 | #define ATC_040 (0x0400) | ||
136 | #define LK_040 (0x0200) | ||
137 | #define RW_040 (0x0100) | ||
138 | #define SIZ_040 (0x0060) | ||
139 | #define TT_040 (0x0018) | ||
140 | #define TM_040 (0x0007) | ||
141 | |||
142 | /* bits for 68040 write back status word */ | ||
143 | #define WBV_040 (0x80) | ||
144 | #define WBSIZ_040 (0x60) | ||
145 | #define WBBYT_040 (0x20) | ||
146 | #define WBWRD_040 (0x40) | ||
147 | #define WBLNG_040 (0x00) | ||
148 | #define WBTT_040 (0x18) | ||
149 | #define WBTM_040 (0x07) | ||
150 | |||
151 | /* bus access size codes */ | ||
152 | #define BA_SIZE_BYTE (0x20) | ||
153 | #define BA_SIZE_WORD (0x40) | ||
154 | #define BA_SIZE_LONG (0x00) | ||
155 | #define BA_SIZE_LINE (0x60) | ||
156 | |||
157 | /* bus access transfer type codes */ | ||
158 | #define BA_TT_MOVE16 (0x08) | ||
159 | |||
160 | /* bits for 68040 MMU status register (mmusr) */ | ||
161 | #define MMU_B_040 (0x0800) | ||
162 | #define MMU_G_040 (0x0400) | ||
163 | #define MMU_S_040 (0x0080) | ||
164 | #define MMU_CM_040 (0x0060) | ||
165 | #define MMU_M_040 (0x0010) | ||
166 | #define MMU_WP_040 (0x0004) | ||
167 | #define MMU_T_040 (0x0002) | ||
168 | #define MMU_R_040 (0x0001) | ||
169 | |||
170 | /* bits in the 68060 fault status long word (FSLW) */ | ||
171 | #define MMU060_MA (0x08000000) /* misaligned */ | ||
172 | #define MMU060_LK (0x02000000) /* locked transfer */ | ||
173 | #define MMU060_RW (0x01800000) /* read/write */ | ||
174 | # define MMU060_RW_W (0x00800000) /* write */ | ||
175 | # define MMU060_RW_R (0x01000000) /* read */ | ||
176 | # define MMU060_RW_RMW (0x01800000) /* read/modify/write */ | ||
177 | # define MMU060_W (0x00800000) /* general write, includes rmw */ | ||
178 | #define MMU060_SIZ (0x00600000) /* transfer size */ | ||
179 | #define MMU060_TT (0x00180000) /* transfer type (TT) bits */ | ||
180 | #define MMU060_TM (0x00070000) /* transfer modifier (TM) bits */ | ||
181 | #define MMU060_IO (0x00008000) /* instruction or operand */ | ||
182 | #define MMU060_PBE (0x00004000) /* push buffer bus error */ | ||
183 | #define MMU060_SBE (0x00002000) /* store buffer bus error */ | ||
184 | #define MMU060_PTA (0x00001000) /* pointer A fault */ | ||
185 | #define MMU060_PTB (0x00000800) /* pointer B fault */ | ||
186 | #define MMU060_IL (0x00000400) /* double indirect descr fault */ | ||
187 | #define MMU060_PF (0x00000200) /* page fault (invalid descr) */ | ||
188 | #define MMU060_SP (0x00000100) /* supervisor protection */ | ||
189 | #define MMU060_WP (0x00000080) /* write protection */ | ||
190 | #define MMU060_TWE (0x00000040) /* bus error on table search */ | ||
191 | #define MMU060_RE (0x00000020) /* bus error on read */ | ||
192 | #define MMU060_WE (0x00000010) /* bus error on write */ | ||
193 | #define MMU060_TTR (0x00000008) /* error caused by TTR translation */ | ||
194 | #define MMU060_BPE (0x00000004) /* branch prediction error */ | ||
195 | #define MMU060_SEE (0x00000001) /* software emulated error */ | ||
196 | |||
197 | /* cases of missing or invalid descriptors */ | ||
198 | #define MMU060_DESC_ERR (MMU060_PTA | MMU060_PTB | \ | ||
199 | MMU060_IL | MMU060_PF) | ||
200 | /* bits that indicate real errors */ | ||
201 | #define MMU060_ERR_BITS (MMU060_PBE | MMU060_SBE | MMU060_DESC_ERR | MMU060_SP | \ | ||
202 | MMU060_WP | MMU060_TWE | MMU060_RE | MMU060_WE) | ||
203 | |||
204 | /* structure for stack frames */ | ||
205 | |||
206 | struct frame { | ||
207 | struct pt_regs ptregs; | ||
208 | union { | ||
209 | struct { | ||
210 | unsigned long iaddr; /* instruction address */ | ||
211 | } fmt2; | ||
212 | struct { | ||
213 | unsigned long effaddr; /* effective address */ | ||
214 | } fmt3; | ||
215 | struct { | ||
216 | unsigned long effaddr; /* effective address */ | ||
217 | unsigned long pc; /* pc of faulted instr */ | ||
218 | } fmt4; | ||
219 | struct { | ||
220 | unsigned long effaddr; /* effective address */ | ||
221 | unsigned short ssw; /* special status word */ | ||
222 | unsigned short wb3s; /* write back 3 status */ | ||
223 | unsigned short wb2s; /* write back 2 status */ | ||
224 | unsigned short wb1s; /* write back 1 status */ | ||
225 | unsigned long faddr; /* fault address */ | ||
226 | unsigned long wb3a; /* write back 3 address */ | ||
227 | unsigned long wb3d; /* write back 3 data */ | ||
228 | unsigned long wb2a; /* write back 2 address */ | ||
229 | unsigned long wb2d; /* write back 2 data */ | ||
230 | unsigned long wb1a; /* write back 1 address */ | ||
231 | unsigned long wb1dpd0; /* write back 1 data/push data 0*/ | ||
232 | unsigned long pd1; /* push data 1*/ | ||
233 | unsigned long pd2; /* push data 2*/ | ||
234 | unsigned long pd3; /* push data 3*/ | ||
235 | } fmt7; | ||
236 | struct { | ||
237 | unsigned long iaddr; /* instruction address */ | ||
238 | unsigned short int1[4]; /* internal registers */ | ||
239 | } fmt9; | ||
240 | struct { | ||
241 | unsigned short int1; | ||
242 | unsigned short ssw; /* special status word */ | ||
243 | unsigned short isc; /* instruction stage c */ | ||
244 | unsigned short isb; /* instruction stage b */ | ||
245 | unsigned long daddr; /* data cycle fault address */ | ||
246 | unsigned short int2[2]; | ||
247 | unsigned long dobuf; /* data cycle output buffer */ | ||
248 | unsigned short int3[2]; | ||
249 | } fmta; | ||
250 | struct { | ||
251 | unsigned short int1; | ||
252 | unsigned short ssw; /* special status word */ | ||
253 | unsigned short isc; /* instruction stage c */ | ||
254 | unsigned short isb; /* instruction stage b */ | ||
255 | unsigned long daddr; /* data cycle fault address */ | ||
256 | unsigned short int2[2]; | ||
257 | unsigned long dobuf; /* data cycle output buffer */ | ||
258 | unsigned short int3[4]; | ||
259 | unsigned long baddr; /* stage B address */ | ||
260 | unsigned short int4[2]; | ||
261 | unsigned long dibuf; /* data cycle input buffer */ | ||
262 | unsigned short int5[3]; | ||
263 | unsigned ver : 4; /* stack frame version # */ | ||
264 | unsigned int6:12; | ||
265 | unsigned short int7[18]; | ||
266 | } fmtb; | ||
267 | } un; | ||
268 | }; | ||
269 | |||
270 | #endif /* __ASSEMBLY__ */ | ||
271 | |||
272 | #endif /* _M68K_TRAPS_H */ | ||
diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h deleted file mode 100644 index 6441cb5f8e7c..000000000000 --- a/include/asm-m68k/types.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | #ifndef _M68K_TYPES_H | ||
2 | #define _M68K_TYPES_H | ||
3 | |||
4 | /* | ||
5 | * This file is never included by application software unless | ||
6 | * explicitly requested (e.g., via linux/types.h) in which case the | ||
7 | * application is Linux specific so (user-) name space pollution is | ||
8 | * not a major issue. However, for interoperability, libraries still | ||
9 | * need to be careful to avoid a name clashes. | ||
10 | */ | ||
11 | #include <asm-generic/int-ll64.h> | ||
12 | |||
13 | #ifndef __ASSEMBLY__ | ||
14 | |||
15 | typedef unsigned short umode_t; | ||
16 | |||
17 | #endif /* __ASSEMBLY__ */ | ||
18 | |||
19 | /* | ||
20 | * These aren't exported outside the kernel to avoid name space clashes | ||
21 | */ | ||
22 | #ifdef __KERNEL__ | ||
23 | |||
24 | #define BITS_PER_LONG 32 | ||
25 | |||
26 | #ifndef __ASSEMBLY__ | ||
27 | |||
28 | /* DMA addresses are always 32-bits wide */ | ||
29 | |||
30 | typedef u32 dma_addr_t; | ||
31 | typedef u32 dma64_addr_t; | ||
32 | |||
33 | #endif /* __ASSEMBLY__ */ | ||
34 | |||
35 | #endif /* __KERNEL__ */ | ||
36 | |||
37 | #endif /* _M68K_TYPES_H */ | ||
diff --git a/include/asm-m68k/uaccess.h b/include/asm-m68k/uaccess.h deleted file mode 100644 index 7107f3fbdbb6..000000000000 --- a/include/asm-m68k/uaccess.h +++ /dev/null | |||
@@ -1,374 +0,0 @@ | |||
1 | #ifndef __M68K_UACCESS_H | ||
2 | #define __M68K_UACCESS_H | ||
3 | |||
4 | /* | ||
5 | * User space memory access functions | ||
6 | */ | ||
7 | #include <linux/compiler.h> | ||
8 | #include <linux/errno.h> | ||
9 | #include <linux/types.h> | ||
10 | #include <linux/sched.h> | ||
11 | #include <asm/segment.h> | ||
12 | |||
13 | #define VERIFY_READ 0 | ||
14 | #define VERIFY_WRITE 1 | ||
15 | |||
16 | /* We let the MMU do all checking */ | ||
17 | static inline int access_ok(int type, const void __user *addr, | ||
18 | unsigned long size) | ||
19 | { | ||
20 | return 1; | ||
21 | } | ||
22 | |||
23 | /* | ||
24 | * The exception table consists of pairs of addresses: the first is the | ||
25 | * address of an instruction that is allowed to fault, and the second is | ||
26 | * the address at which the program should continue. No registers are | ||
27 | * modified, so it is entirely up to the continuation code to figure out | ||
28 | * what to do. | ||
29 | * | ||
30 | * All the routines below use bits of fixup code that are out of line | ||
31 | * with the main instruction path. This means when everything is well, | ||
32 | * we don't even have to jump over them. Further, they do not intrude | ||
33 | * on our cache or tlb entries. | ||
34 | */ | ||
35 | |||
36 | struct exception_table_entry | ||
37 | { | ||
38 | unsigned long insn, fixup; | ||
39 | }; | ||
40 | |||
41 | extern int __put_user_bad(void); | ||
42 | extern int __get_user_bad(void); | ||
43 | |||
44 | #define __put_user_asm(res, x, ptr, bwl, reg, err) \ | ||
45 | asm volatile ("\n" \ | ||
46 | "1: moves."#bwl" %2,%1\n" \ | ||
47 | "2:\n" \ | ||
48 | " .section .fixup,\"ax\"\n" \ | ||
49 | " .even\n" \ | ||
50 | "10: moveq.l %3,%0\n" \ | ||
51 | " jra 2b\n" \ | ||
52 | " .previous\n" \ | ||
53 | "\n" \ | ||
54 | " .section __ex_table,\"a\"\n" \ | ||
55 | " .align 4\n" \ | ||
56 | " .long 1b,10b\n" \ | ||
57 | " .long 2b,10b\n" \ | ||
58 | " .previous" \ | ||
59 | : "+d" (res), "=m" (*(ptr)) \ | ||
60 | : #reg (x), "i" (err)) | ||
61 | |||
62 | /* | ||
63 | * These are the main single-value transfer routines. They automatically | ||
64 | * use the right size if we just have the right pointer type. | ||
65 | */ | ||
66 | |||
67 | #define __put_user(x, ptr) \ | ||
68 | ({ \ | ||
69 | typeof(*(ptr)) __pu_val = (x); \ | ||
70 | int __pu_err = 0; \ | ||
71 | __chk_user_ptr(ptr); \ | ||
72 | switch (sizeof (*(ptr))) { \ | ||
73 | case 1: \ | ||
74 | __put_user_asm(__pu_err, __pu_val, ptr, b, d, -EFAULT); \ | ||
75 | break; \ | ||
76 | case 2: \ | ||
77 | __put_user_asm(__pu_err, __pu_val, ptr, w, d, -EFAULT); \ | ||
78 | break; \ | ||
79 | case 4: \ | ||
80 | __put_user_asm(__pu_err, __pu_val, ptr, l, r, -EFAULT); \ | ||
81 | break; \ | ||
82 | case 8: \ | ||
83 | { \ | ||
84 | const void __user *__pu_ptr = (ptr); \ | ||
85 | asm volatile ("\n" \ | ||
86 | "1: moves.l %2,(%1)+\n" \ | ||
87 | "2: moves.l %R2,(%1)\n" \ | ||
88 | "3:\n" \ | ||
89 | " .section .fixup,\"ax\"\n" \ | ||
90 | " .even\n" \ | ||
91 | "10: movel %3,%0\n" \ | ||
92 | " jra 3b\n" \ | ||
93 | " .previous\n" \ | ||
94 | "\n" \ | ||
95 | " .section __ex_table,\"a\"\n" \ | ||
96 | " .align 4\n" \ | ||
97 | " .long 1b,10b\n" \ | ||
98 | " .long 2b,10b\n" \ | ||
99 | " .long 3b,10b\n" \ | ||
100 | " .previous" \ | ||
101 | : "+d" (__pu_err), "+a" (__pu_ptr) \ | ||
102 | : "r" (__pu_val), "i" (-EFAULT) \ | ||
103 | : "memory"); \ | ||
104 | break; \ | ||
105 | } \ | ||
106 | default: \ | ||
107 | __pu_err = __put_user_bad(); \ | ||
108 | break; \ | ||
109 | } \ | ||
110 | __pu_err; \ | ||
111 | }) | ||
112 | #define put_user(x, ptr) __put_user(x, ptr) | ||
113 | |||
114 | |||
115 | #define __get_user_asm(res, x, ptr, type, bwl, reg, err) ({ \ | ||
116 | type __gu_val; \ | ||
117 | asm volatile ("\n" \ | ||
118 | "1: moves."#bwl" %2,%1\n" \ | ||
119 | "2:\n" \ | ||
120 | " .section .fixup,\"ax\"\n" \ | ||
121 | " .even\n" \ | ||
122 | "10: move.l %3,%0\n" \ | ||
123 | " sub."#bwl" %1,%1\n" \ | ||
124 | " jra 2b\n" \ | ||
125 | " .previous\n" \ | ||
126 | "\n" \ | ||
127 | " .section __ex_table,\"a\"\n" \ | ||
128 | " .align 4\n" \ | ||
129 | " .long 1b,10b\n" \ | ||
130 | " .previous" \ | ||
131 | : "+d" (res), "=&" #reg (__gu_val) \ | ||
132 | : "m" (*(ptr)), "i" (err)); \ | ||
133 | (x) = (typeof(*(ptr)))(unsigned long)__gu_val; \ | ||
134 | }) | ||
135 | |||
136 | #define __get_user(x, ptr) \ | ||
137 | ({ \ | ||
138 | int __gu_err = 0; \ | ||
139 | __chk_user_ptr(ptr); \ | ||
140 | switch (sizeof(*(ptr))) { \ | ||
141 | case 1: \ | ||
142 | __get_user_asm(__gu_err, x, ptr, u8, b, d, -EFAULT); \ | ||
143 | break; \ | ||
144 | case 2: \ | ||
145 | __get_user_asm(__gu_err, x, ptr, u16, w, d, -EFAULT); \ | ||
146 | break; \ | ||
147 | case 4: \ | ||
148 | __get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \ | ||
149 | break; \ | ||
150 | /* case 8: disabled because gcc-4.1 has a broken typeof \ | ||
151 | { \ | ||
152 | const void *__gu_ptr = (ptr); \ | ||
153 | u64 __gu_val; \ | ||
154 | asm volatile ("\n" \ | ||
155 | "1: moves.l (%2)+,%1\n" \ | ||
156 | "2: moves.l (%2),%R1\n" \ | ||
157 | "3:\n" \ | ||
158 | " .section .fixup,\"ax\"\n" \ | ||
159 | " .even\n" \ | ||
160 | "10: move.l %3,%0\n" \ | ||
161 | " sub.l %1,%1\n" \ | ||
162 | " sub.l %R1,%R1\n" \ | ||
163 | " jra 3b\n" \ | ||
164 | " .previous\n" \ | ||
165 | "\n" \ | ||
166 | " .section __ex_table,\"a\"\n" \ | ||
167 | " .align 4\n" \ | ||
168 | " .long 1b,10b\n" \ | ||
169 | " .long 2b,10b\n" \ | ||
170 | " .previous" \ | ||
171 | : "+d" (__gu_err), "=&r" (__gu_val), \ | ||
172 | "+a" (__gu_ptr) \ | ||
173 | : "i" (-EFAULT) \ | ||
174 | : "memory"); \ | ||
175 | (x) = (typeof(*(ptr)))__gu_val; \ | ||
176 | break; \ | ||
177 | } */ \ | ||
178 | default: \ | ||
179 | __gu_err = __get_user_bad(); \ | ||
180 | break; \ | ||
181 | } \ | ||
182 | __gu_err; \ | ||
183 | }) | ||
184 | #define get_user(x, ptr) __get_user(x, ptr) | ||
185 | |||
186 | unsigned long __generic_copy_from_user(void *to, const void __user *from, unsigned long n); | ||
187 | unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n); | ||
188 | |||
189 | #define __constant_copy_from_user_asm(res, to, from, tmp, n, s1, s2, s3)\ | ||
190 | asm volatile ("\n" \ | ||
191 | "1: moves."#s1" (%2)+,%3\n" \ | ||
192 | " move."#s1" %3,(%1)+\n" \ | ||
193 | "2: moves."#s2" (%2)+,%3\n" \ | ||
194 | " move."#s2" %3,(%1)+\n" \ | ||
195 | " .ifnc \""#s3"\",\"\"\n" \ | ||
196 | "3: moves."#s3" (%2)+,%3\n" \ | ||
197 | " move."#s3" %3,(%1)+\n" \ | ||
198 | " .endif\n" \ | ||
199 | "4:\n" \ | ||
200 | " .section __ex_table,\"a\"\n" \ | ||
201 | " .align 4\n" \ | ||
202 | " .long 1b,10f\n" \ | ||
203 | " .long 2b,20f\n" \ | ||
204 | " .ifnc \""#s3"\",\"\"\n" \ | ||
205 | " .long 3b,30f\n" \ | ||
206 | " .endif\n" \ | ||
207 | " .previous\n" \ | ||
208 | "\n" \ | ||
209 | " .section .fixup,\"ax\"\n" \ | ||
210 | " .even\n" \ | ||
211 | "10: clr."#s1" (%1)+\n" \ | ||
212 | "20: clr."#s2" (%1)+\n" \ | ||
213 | " .ifnc \""#s3"\",\"\"\n" \ | ||
214 | "30: clr."#s3" (%1)+\n" \ | ||
215 | " .endif\n" \ | ||
216 | " moveq.l #"#n",%0\n" \ | ||
217 | " jra 4b\n" \ | ||
218 | " .previous\n" \ | ||
219 | : "+d" (res), "+&a" (to), "+a" (from), "=&d" (tmp) \ | ||
220 | : : "memory") | ||
221 | |||
222 | static __always_inline unsigned long | ||
223 | __constant_copy_from_user(void *to, const void __user *from, unsigned long n) | ||
224 | { | ||
225 | unsigned long res = 0, tmp; | ||
226 | |||
227 | switch (n) { | ||
228 | case 1: | ||
229 | __get_user_asm(res, *(u8 *)to, (u8 __user *)from, u8, b, d, 1); | ||
230 | break; | ||
231 | case 2: | ||
232 | __get_user_asm(res, *(u16 *)to, (u16 __user *)from, u16, w, d, 2); | ||
233 | break; | ||
234 | case 3: | ||
235 | __constant_copy_from_user_asm(res, to, from, tmp, 3, w, b,); | ||
236 | break; | ||
237 | case 4: | ||
238 | __get_user_asm(res, *(u32 *)to, (u32 __user *)from, u32, l, r, 4); | ||
239 | break; | ||
240 | case 5: | ||
241 | __constant_copy_from_user_asm(res, to, from, tmp, 5, l, b,); | ||
242 | break; | ||
243 | case 6: | ||
244 | __constant_copy_from_user_asm(res, to, from, tmp, 6, l, w,); | ||
245 | break; | ||
246 | case 7: | ||
247 | __constant_copy_from_user_asm(res, to, from, tmp, 7, l, w, b); | ||
248 | break; | ||
249 | case 8: | ||
250 | __constant_copy_from_user_asm(res, to, from, tmp, 8, l, l,); | ||
251 | break; | ||
252 | case 9: | ||
253 | __constant_copy_from_user_asm(res, to, from, tmp, 9, l, l, b); | ||
254 | break; | ||
255 | case 10: | ||
256 | __constant_copy_from_user_asm(res, to, from, tmp, 10, l, l, w); | ||
257 | break; | ||
258 | case 12: | ||
259 | __constant_copy_from_user_asm(res, to, from, tmp, 12, l, l, l); | ||
260 | break; | ||
261 | default: | ||
262 | /* we limit the inlined version to 3 moves */ | ||
263 | return __generic_copy_from_user(to, from, n); | ||
264 | } | ||
265 | |||
266 | return res; | ||
267 | } | ||
268 | |||
269 | #define __constant_copy_to_user_asm(res, to, from, tmp, n, s1, s2, s3) \ | ||
270 | asm volatile ("\n" \ | ||
271 | " move."#s1" (%2)+,%3\n" \ | ||
272 | "11: moves."#s1" %3,(%1)+\n" \ | ||
273 | "12: move."#s2" (%2)+,%3\n" \ | ||
274 | "21: moves."#s2" %3,(%1)+\n" \ | ||
275 | "22:\n" \ | ||
276 | " .ifnc \""#s3"\",\"\"\n" \ | ||
277 | " move."#s3" (%2)+,%3\n" \ | ||
278 | "31: moves."#s3" %3,(%1)+\n" \ | ||
279 | "32:\n" \ | ||
280 | " .endif\n" \ | ||
281 | "4:\n" \ | ||
282 | "\n" \ | ||
283 | " .section __ex_table,\"a\"\n" \ | ||
284 | " .align 4\n" \ | ||
285 | " .long 11b,5f\n" \ | ||
286 | " .long 12b,5f\n" \ | ||
287 | " .long 21b,5f\n" \ | ||
288 | " .long 22b,5f\n" \ | ||
289 | " .ifnc \""#s3"\",\"\"\n" \ | ||
290 | " .long 31b,5f\n" \ | ||
291 | " .long 32b,5f\n" \ | ||
292 | " .endif\n" \ | ||
293 | " .previous\n" \ | ||
294 | "\n" \ | ||
295 | " .section .fixup,\"ax\"\n" \ | ||
296 | " .even\n" \ | ||
297 | "5: moveq.l #"#n",%0\n" \ | ||
298 | " jra 4b\n" \ | ||
299 | " .previous\n" \ | ||
300 | : "+d" (res), "+a" (to), "+a" (from), "=&d" (tmp) \ | ||
301 | : : "memory") | ||
302 | |||
303 | static __always_inline unsigned long | ||
304 | __constant_copy_to_user(void __user *to, const void *from, unsigned long n) | ||
305 | { | ||
306 | unsigned long res = 0, tmp; | ||
307 | |||
308 | switch (n) { | ||
309 | case 1: | ||
310 | __put_user_asm(res, *(u8 *)from, (u8 __user *)to, b, d, 1); | ||
311 | break; | ||
312 | case 2: | ||
313 | __put_user_asm(res, *(u16 *)from, (u16 __user *)to, w, d, 2); | ||
314 | break; | ||
315 | case 3: | ||
316 | __constant_copy_to_user_asm(res, to, from, tmp, 3, w, b,); | ||
317 | break; | ||
318 | case 4: | ||
319 | __put_user_asm(res, *(u32 *)from, (u32 __user *)to, l, r, 4); | ||
320 | break; | ||
321 | case 5: | ||
322 | __constant_copy_to_user_asm(res, to, from, tmp, 5, l, b,); | ||
323 | break; | ||
324 | case 6: | ||
325 | __constant_copy_to_user_asm(res, to, from, tmp, 6, l, w,); | ||
326 | break; | ||
327 | case 7: | ||
328 | __constant_copy_to_user_asm(res, to, from, tmp, 7, l, w, b); | ||
329 | break; | ||
330 | case 8: | ||
331 | __constant_copy_to_user_asm(res, to, from, tmp, 8, l, l,); | ||
332 | break; | ||
333 | case 9: | ||
334 | __constant_copy_to_user_asm(res, to, from, tmp, 9, l, l, b); | ||
335 | break; | ||
336 | case 10: | ||
337 | __constant_copy_to_user_asm(res, to, from, tmp, 10, l, l, w); | ||
338 | break; | ||
339 | case 12: | ||
340 | __constant_copy_to_user_asm(res, to, from, tmp, 12, l, l, l); | ||
341 | break; | ||
342 | default: | ||
343 | /* limit the inlined version to 3 moves */ | ||
344 | return __generic_copy_to_user(to, from, n); | ||
345 | } | ||
346 | |||
347 | return res; | ||
348 | } | ||
349 | |||
350 | #define __copy_from_user(to, from, n) \ | ||
351 | (__builtin_constant_p(n) ? \ | ||
352 | __constant_copy_from_user(to, from, n) : \ | ||
353 | __generic_copy_from_user(to, from, n)) | ||
354 | |||
355 | #define __copy_to_user(to, from, n) \ | ||
356 | (__builtin_constant_p(n) ? \ | ||
357 | __constant_copy_to_user(to, from, n) : \ | ||
358 | __generic_copy_to_user(to, from, n)) | ||
359 | |||
360 | #define __copy_to_user_inatomic __copy_to_user | ||
361 | #define __copy_from_user_inatomic __copy_from_user | ||
362 | |||
363 | #define copy_from_user(to, from, n) __copy_from_user(to, from, n) | ||
364 | #define copy_to_user(to, from, n) __copy_to_user(to, from, n) | ||
365 | |||
366 | long strncpy_from_user(char *dst, const char __user *src, long count); | ||
367 | long strnlen_user(const char __user *src, long n); | ||
368 | unsigned long __clear_user(void __user *to, unsigned long n); | ||
369 | |||
370 | #define clear_user __clear_user | ||
371 | |||
372 | #define strlen_user(str) strnlen_user(str, 32767) | ||
373 | |||
374 | #endif /* _M68K_UACCESS_H */ | ||
diff --git a/include/asm-m68k/ucontext.h b/include/asm-m68k/ucontext.h deleted file mode 100644 index e4e22669edc0..000000000000 --- a/include/asm-m68k/ucontext.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | #ifndef _M68K_UCONTEXT_H | ||
2 | #define _M68K_UCONTEXT_H | ||
3 | |||
4 | typedef int greg_t; | ||
5 | #define NGREG 18 | ||
6 | typedef greg_t gregset_t[NGREG]; | ||
7 | |||
8 | typedef struct fpregset { | ||
9 | int f_fpcntl[3]; | ||
10 | int f_fpregs[8*3]; | ||
11 | } fpregset_t; | ||
12 | |||
13 | struct mcontext { | ||
14 | int version; | ||
15 | gregset_t gregs; | ||
16 | fpregset_t fpregs; | ||
17 | }; | ||
18 | |||
19 | #define MCONTEXT_VERSION 2 | ||
20 | |||
21 | struct ucontext { | ||
22 | unsigned long uc_flags; | ||
23 | struct ucontext *uc_link; | ||
24 | stack_t uc_stack; | ||
25 | struct mcontext uc_mcontext; | ||
26 | unsigned long uc_filler[80]; | ||
27 | sigset_t uc_sigmask; /* mask last for extensibility */ | ||
28 | }; | ||
29 | |||
30 | #endif | ||
diff --git a/include/asm-m68k/unaligned.h b/include/asm-m68k/unaligned.h deleted file mode 100644 index 77698f2dc33c..000000000000 --- a/include/asm-m68k/unaligned.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_UNALIGNED_H | ||
2 | #define _ASM_M68K_UNALIGNED_H | ||
3 | |||
4 | /* | ||
5 | * The m68k can do unaligned accesses itself. | ||
6 | */ | ||
7 | #include <linux/unaligned/access_ok.h> | ||
8 | #include <linux/unaligned/generic.h> | ||
9 | |||
10 | #define get_unaligned __get_unaligned_be | ||
11 | #define put_unaligned __put_unaligned_be | ||
12 | |||
13 | #endif /* _ASM_M68K_UNALIGNED_H */ | ||
diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h deleted file mode 100644 index 3c19027331fa..000000000000 --- a/include/asm-m68k/unistd.h +++ /dev/null | |||
@@ -1,372 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_UNISTD_H_ | ||
2 | #define _ASM_M68K_UNISTD_H_ | ||
3 | |||
4 | /* | ||
5 | * This file contains the system call numbers. | ||
6 | */ | ||
7 | |||
8 | #define __NR_restart_syscall 0 | ||
9 | #define __NR_exit 1 | ||
10 | #define __NR_fork 2 | ||
11 | #define __NR_read 3 | ||
12 | #define __NR_write 4 | ||
13 | #define __NR_open 5 | ||
14 | #define __NR_close 6 | ||
15 | #define __NR_waitpid 7 | ||
16 | #define __NR_creat 8 | ||
17 | #define __NR_link 9 | ||
18 | #define __NR_unlink 10 | ||
19 | #define __NR_execve 11 | ||
20 | #define __NR_chdir 12 | ||
21 | #define __NR_time 13 | ||
22 | #define __NR_mknod 14 | ||
23 | #define __NR_chmod 15 | ||
24 | #define __NR_chown 16 | ||
25 | #define __NR_break 17 | ||
26 | #define __NR_oldstat 18 | ||
27 | #define __NR_lseek 19 | ||
28 | #define __NR_getpid 20 | ||
29 | #define __NR_mount 21 | ||
30 | #define __NR_umount 22 | ||
31 | #define __NR_setuid 23 | ||
32 | #define __NR_getuid 24 | ||
33 | #define __NR_stime 25 | ||
34 | #define __NR_ptrace 26 | ||
35 | #define __NR_alarm 27 | ||
36 | #define __NR_oldfstat 28 | ||
37 | #define __NR_pause 29 | ||
38 | #define __NR_utime 30 | ||
39 | #define __NR_stty 31 | ||
40 | #define __NR_gtty 32 | ||
41 | #define __NR_access 33 | ||
42 | #define __NR_nice 34 | ||
43 | #define __NR_ftime 35 | ||
44 | #define __NR_sync 36 | ||
45 | #define __NR_kill 37 | ||
46 | #define __NR_rename 38 | ||
47 | #define __NR_mkdir 39 | ||
48 | #define __NR_rmdir 40 | ||
49 | #define __NR_dup 41 | ||
50 | #define __NR_pipe 42 | ||
51 | #define __NR_times 43 | ||
52 | #define __NR_prof 44 | ||
53 | #define __NR_brk 45 | ||
54 | #define __NR_setgid 46 | ||
55 | #define __NR_getgid 47 | ||
56 | #define __NR_signal 48 | ||
57 | #define __NR_geteuid 49 | ||
58 | #define __NR_getegid 50 | ||
59 | #define __NR_acct 51 | ||
60 | #define __NR_umount2 52 | ||
61 | #define __NR_lock 53 | ||
62 | #define __NR_ioctl 54 | ||
63 | #define __NR_fcntl 55 | ||
64 | #define __NR_mpx 56 | ||
65 | #define __NR_setpgid 57 | ||
66 | #define __NR_ulimit 58 | ||
67 | #define __NR_oldolduname 59 | ||
68 | #define __NR_umask 60 | ||
69 | #define __NR_chroot 61 | ||
70 | #define __NR_ustat 62 | ||
71 | #define __NR_dup2 63 | ||
72 | #define __NR_getppid 64 | ||
73 | #define __NR_getpgrp 65 | ||
74 | #define __NR_setsid 66 | ||
75 | #define __NR_sigaction 67 | ||
76 | #define __NR_sgetmask 68 | ||
77 | #define __NR_ssetmask 69 | ||
78 | #define __NR_setreuid 70 | ||
79 | #define __NR_setregid 71 | ||
80 | #define __NR_sigsuspend 72 | ||
81 | #define __NR_sigpending 73 | ||
82 | #define __NR_sethostname 74 | ||
83 | #define __NR_setrlimit 75 | ||
84 | #define __NR_getrlimit 76 | ||
85 | #define __NR_getrusage 77 | ||
86 | #define __NR_gettimeofday 78 | ||
87 | #define __NR_settimeofday 79 | ||
88 | #define __NR_getgroups 80 | ||
89 | #define __NR_setgroups 81 | ||
90 | #define __NR_select 82 | ||
91 | #define __NR_symlink 83 | ||
92 | #define __NR_oldlstat 84 | ||
93 | #define __NR_readlink 85 | ||
94 | #define __NR_uselib 86 | ||
95 | #define __NR_swapon 87 | ||
96 | #define __NR_reboot 88 | ||
97 | #define __NR_readdir 89 | ||
98 | #define __NR_mmap 90 | ||
99 | #define __NR_munmap 91 | ||
100 | #define __NR_truncate 92 | ||
101 | #define __NR_ftruncate 93 | ||
102 | #define __NR_fchmod 94 | ||
103 | #define __NR_fchown 95 | ||
104 | #define __NR_getpriority 96 | ||
105 | #define __NR_setpriority 97 | ||
106 | #define __NR_profil 98 | ||
107 | #define __NR_statfs 99 | ||
108 | #define __NR_fstatfs 100 | ||
109 | #define __NR_ioperm 101 | ||
110 | #define __NR_socketcall 102 | ||
111 | #define __NR_syslog 103 | ||
112 | #define __NR_setitimer 104 | ||
113 | #define __NR_getitimer 105 | ||
114 | #define __NR_stat 106 | ||
115 | #define __NR_lstat 107 | ||
116 | #define __NR_fstat 108 | ||
117 | #define __NR_olduname 109 | ||
118 | #define __NR_iopl /* 110 */ not supported | ||
119 | #define __NR_vhangup 111 | ||
120 | #define __NR_idle /* 112 */ Obsolete | ||
121 | #define __NR_vm86 /* 113 */ not supported | ||
122 | #define __NR_wait4 114 | ||
123 | #define __NR_swapoff 115 | ||
124 | #define __NR_sysinfo 116 | ||
125 | #define __NR_ipc 117 | ||
126 | #define __NR_fsync 118 | ||
127 | #define __NR_sigreturn 119 | ||
128 | #define __NR_clone 120 | ||
129 | #define __NR_setdomainname 121 | ||
130 | #define __NR_uname 122 | ||
131 | #define __NR_cacheflush 123 | ||
132 | #define __NR_adjtimex 124 | ||
133 | #define __NR_mprotect 125 | ||
134 | #define __NR_sigprocmask 126 | ||
135 | #define __NR_create_module 127 | ||
136 | #define __NR_init_module 128 | ||
137 | #define __NR_delete_module 129 | ||
138 | #define __NR_get_kernel_syms 130 | ||
139 | #define __NR_quotactl 131 | ||
140 | #define __NR_getpgid 132 | ||
141 | #define __NR_fchdir 133 | ||
142 | #define __NR_bdflush 134 | ||
143 | #define __NR_sysfs 135 | ||
144 | #define __NR_personality 136 | ||
145 | #define __NR_afs_syscall 137 /* Syscall for Andrew File System */ | ||
146 | #define __NR_setfsuid 138 | ||
147 | #define __NR_setfsgid 139 | ||
148 | #define __NR__llseek 140 | ||
149 | #define __NR_getdents 141 | ||
150 | #define __NR__newselect 142 | ||
151 | #define __NR_flock 143 | ||
152 | #define __NR_msync 144 | ||
153 | #define __NR_readv 145 | ||
154 | #define __NR_writev 146 | ||
155 | #define __NR_getsid 147 | ||
156 | #define __NR_fdatasync 148 | ||
157 | #define __NR__sysctl 149 | ||
158 | #define __NR_mlock 150 | ||
159 | #define __NR_munlock 151 | ||
160 | #define __NR_mlockall 152 | ||
161 | #define __NR_munlockall 153 | ||
162 | #define __NR_sched_setparam 154 | ||
163 | #define __NR_sched_getparam 155 | ||
164 | #define __NR_sched_setscheduler 156 | ||
165 | #define __NR_sched_getscheduler 157 | ||
166 | #define __NR_sched_yield 158 | ||
167 | #define __NR_sched_get_priority_max 159 | ||
168 | #define __NR_sched_get_priority_min 160 | ||
169 | #define __NR_sched_rr_get_interval 161 | ||
170 | #define __NR_nanosleep 162 | ||
171 | #define __NR_mremap 163 | ||
172 | #define __NR_setresuid 164 | ||
173 | #define __NR_getresuid 165 | ||
174 | #define __NR_getpagesize 166 | ||
175 | #define __NR_query_module 167 | ||
176 | #define __NR_poll 168 | ||
177 | #define __NR_nfsservctl 169 | ||
178 | #define __NR_setresgid 170 | ||
179 | #define __NR_getresgid 171 | ||
180 | #define __NR_prctl 172 | ||
181 | #define __NR_rt_sigreturn 173 | ||
182 | #define __NR_rt_sigaction 174 | ||
183 | #define __NR_rt_sigprocmask 175 | ||
184 | #define __NR_rt_sigpending 176 | ||
185 | #define __NR_rt_sigtimedwait 177 | ||
186 | #define __NR_rt_sigqueueinfo 178 | ||
187 | #define __NR_rt_sigsuspend 179 | ||
188 | #define __NR_pread64 180 | ||
189 | #define __NR_pwrite64 181 | ||
190 | #define __NR_lchown 182 | ||
191 | #define __NR_getcwd 183 | ||
192 | #define __NR_capget 184 | ||
193 | #define __NR_capset 185 | ||
194 | #define __NR_sigaltstack 186 | ||
195 | #define __NR_sendfile 187 | ||
196 | #define __NR_getpmsg 188 /* some people actually want streams */ | ||
197 | #define __NR_putpmsg 189 /* some people actually want streams */ | ||
198 | #define __NR_vfork 190 | ||
199 | #define __NR_ugetrlimit 191 | ||
200 | #define __NR_mmap2 192 | ||
201 | #define __NR_truncate64 193 | ||
202 | #define __NR_ftruncate64 194 | ||
203 | #define __NR_stat64 195 | ||
204 | #define __NR_lstat64 196 | ||
205 | #define __NR_fstat64 197 | ||
206 | #define __NR_chown32 198 | ||
207 | #define __NR_getuid32 199 | ||
208 | #define __NR_getgid32 200 | ||
209 | #define __NR_geteuid32 201 | ||
210 | #define __NR_getegid32 202 | ||
211 | #define __NR_setreuid32 203 | ||
212 | #define __NR_setregid32 204 | ||
213 | #define __NR_getgroups32 205 | ||
214 | #define __NR_setgroups32 206 | ||
215 | #define __NR_fchown32 207 | ||
216 | #define __NR_setresuid32 208 | ||
217 | #define __NR_getresuid32 209 | ||
218 | #define __NR_setresgid32 210 | ||
219 | #define __NR_getresgid32 211 | ||
220 | #define __NR_lchown32 212 | ||
221 | #define __NR_setuid32 213 | ||
222 | #define __NR_setgid32 214 | ||
223 | #define __NR_setfsuid32 215 | ||
224 | #define __NR_setfsgid32 216 | ||
225 | #define __NR_pivot_root 217 | ||
226 | #define __NR_getdents64 220 | ||
227 | #define __NR_gettid 221 | ||
228 | #define __NR_tkill 222 | ||
229 | #define __NR_setxattr 223 | ||
230 | #define __NR_lsetxattr 224 | ||
231 | #define __NR_fsetxattr 225 | ||
232 | #define __NR_getxattr 226 | ||
233 | #define __NR_lgetxattr 227 | ||
234 | #define __NR_fgetxattr 228 | ||
235 | #define __NR_listxattr 229 | ||
236 | #define __NR_llistxattr 230 | ||
237 | #define __NR_flistxattr 231 | ||
238 | #define __NR_removexattr 232 | ||
239 | #define __NR_lremovexattr 233 | ||
240 | #define __NR_fremovexattr 234 | ||
241 | #define __NR_futex 235 | ||
242 | #define __NR_sendfile64 236 | ||
243 | #define __NR_mincore 237 | ||
244 | #define __NR_madvise 238 | ||
245 | #define __NR_fcntl64 239 | ||
246 | #define __NR_readahead 240 | ||
247 | #define __NR_io_setup 241 | ||
248 | #define __NR_io_destroy 242 | ||
249 | #define __NR_io_getevents 243 | ||
250 | #define __NR_io_submit 244 | ||
251 | #define __NR_io_cancel 245 | ||
252 | #define __NR_fadvise64 246 | ||
253 | #define __NR_exit_group 247 | ||
254 | #define __NR_lookup_dcookie 248 | ||
255 | #define __NR_epoll_create 249 | ||
256 | #define __NR_epoll_ctl 250 | ||
257 | #define __NR_epoll_wait 251 | ||
258 | #define __NR_remap_file_pages 252 | ||
259 | #define __NR_set_tid_address 253 | ||
260 | #define __NR_timer_create 254 | ||
261 | #define __NR_timer_settime 255 | ||
262 | #define __NR_timer_gettime 256 | ||
263 | #define __NR_timer_getoverrun 257 | ||
264 | #define __NR_timer_delete 258 | ||
265 | #define __NR_clock_settime 259 | ||
266 | #define __NR_clock_gettime 260 | ||
267 | #define __NR_clock_getres 261 | ||
268 | #define __NR_clock_nanosleep 262 | ||
269 | #define __NR_statfs64 263 | ||
270 | #define __NR_fstatfs64 264 | ||
271 | #define __NR_tgkill 265 | ||
272 | #define __NR_utimes 266 | ||
273 | #define __NR_fadvise64_64 267 | ||
274 | #define __NR_mbind 268 | ||
275 | #define __NR_get_mempolicy 269 | ||
276 | #define __NR_set_mempolicy 270 | ||
277 | #define __NR_mq_open 271 | ||
278 | #define __NR_mq_unlink 272 | ||
279 | #define __NR_mq_timedsend 273 | ||
280 | #define __NR_mq_timedreceive 274 | ||
281 | #define __NR_mq_notify 275 | ||
282 | #define __NR_mq_getsetattr 276 | ||
283 | #define __NR_waitid 277 | ||
284 | #define __NR_vserver 278 | ||
285 | #define __NR_add_key 279 | ||
286 | #define __NR_request_key 280 | ||
287 | #define __NR_keyctl 281 | ||
288 | #define __NR_ioprio_set 282 | ||
289 | #define __NR_ioprio_get 283 | ||
290 | #define __NR_inotify_init 284 | ||
291 | #define __NR_inotify_add_watch 285 | ||
292 | #define __NR_inotify_rm_watch 286 | ||
293 | #define __NR_migrate_pages 287 | ||
294 | #define __NR_openat 288 | ||
295 | #define __NR_mkdirat 289 | ||
296 | #define __NR_mknodat 290 | ||
297 | #define __NR_fchownat 291 | ||
298 | #define __NR_futimesat 292 | ||
299 | #define __NR_fstatat64 293 | ||
300 | #define __NR_unlinkat 294 | ||
301 | #define __NR_renameat 295 | ||
302 | #define __NR_linkat 296 | ||
303 | #define __NR_symlinkat 297 | ||
304 | #define __NR_readlinkat 298 | ||
305 | #define __NR_fchmodat 299 | ||
306 | #define __NR_faccessat 300 | ||
307 | #define __NR_pselect6 301 | ||
308 | #define __NR_ppoll 302 | ||
309 | #define __NR_unshare 303 | ||
310 | #define __NR_set_robust_list 304 | ||
311 | #define __NR_get_robust_list 305 | ||
312 | #define __NR_splice 306 | ||
313 | #define __NR_sync_file_range 307 | ||
314 | #define __NR_tee 308 | ||
315 | #define __NR_vmsplice 309 | ||
316 | #define __NR_move_pages 310 | ||
317 | #define __NR_sched_setaffinity 311 | ||
318 | #define __NR_sched_getaffinity 312 | ||
319 | #define __NR_kexec_load 313 | ||
320 | #define __NR_getcpu 314 | ||
321 | #define __NR_epoll_pwait 315 | ||
322 | #define __NR_utimensat 316 | ||
323 | #define __NR_signalfd 317 | ||
324 | #define __NR_timerfd_create 318 | ||
325 | #define __NR_eventfd 319 | ||
326 | #define __NR_fallocate 320 | ||
327 | #define __NR_timerfd_settime 321 | ||
328 | #define __NR_timerfd_gettime 322 | ||
329 | #define __NR_signalfd4 323 | ||
330 | #define __NR_eventfd2 324 | ||
331 | #define __NR_epoll_create1 325 | ||
332 | #define __NR_dup3 326 | ||
333 | #define __NR_pipe2 327 | ||
334 | #define __NR_inotify_init1 328 | ||
335 | |||
336 | #ifdef __KERNEL__ | ||
337 | |||
338 | #define NR_syscalls 329 | ||
339 | |||
340 | #define __ARCH_WANT_IPC_PARSE_VERSION | ||
341 | #define __ARCH_WANT_OLD_READDIR | ||
342 | #define __ARCH_WANT_OLD_STAT | ||
343 | #define __ARCH_WANT_STAT64 | ||
344 | #define __ARCH_WANT_SYS_ALARM | ||
345 | #define __ARCH_WANT_SYS_GETHOSTNAME | ||
346 | #define __ARCH_WANT_SYS_PAUSE | ||
347 | #define __ARCH_WANT_SYS_SGETMASK | ||
348 | #define __ARCH_WANT_SYS_SIGNAL | ||
349 | #define __ARCH_WANT_SYS_TIME | ||
350 | #define __ARCH_WANT_SYS_UTIME | ||
351 | #define __ARCH_WANT_SYS_WAITPID | ||
352 | #define __ARCH_WANT_SYS_SOCKETCALL | ||
353 | #define __ARCH_WANT_SYS_FADVISE64 | ||
354 | #define __ARCH_WANT_SYS_GETPGRP | ||
355 | #define __ARCH_WANT_SYS_LLSEEK | ||
356 | #define __ARCH_WANT_SYS_NICE | ||
357 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | ||
358 | #define __ARCH_WANT_SYS_OLDUMOUNT | ||
359 | #define __ARCH_WANT_SYS_SIGPENDING | ||
360 | #define __ARCH_WANT_SYS_SIGPROCMASK | ||
361 | #define __ARCH_WANT_SYS_RT_SIGACTION | ||
362 | |||
363 | /* | ||
364 | * "Conditional" syscalls | ||
365 | * | ||
366 | * What we want is __attribute__((weak,alias("sys_ni_syscall"))), | ||
367 | * but it doesn't work on all toolchains, so we just do it by hand | ||
368 | */ | ||
369 | #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall") | ||
370 | |||
371 | #endif /* __KERNEL__ */ | ||
372 | #endif /* _ASM_M68K_UNISTD_H_ */ | ||
diff --git a/include/asm-m68k/user.h b/include/asm-m68k/user.h deleted file mode 100644 index f1f478d6e050..000000000000 --- a/include/asm-m68k/user.h +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | #ifndef _M68K_USER_H | ||
2 | #define _M68K_USER_H | ||
3 | |||
4 | /* Core file format: The core file is written in such a way that gdb | ||
5 | can understand it and provide useful information to the user (under | ||
6 | linux we use the 'trad-core' bfd). There are quite a number of | ||
7 | obstacles to being able to view the contents of the floating point | ||
8 | registers, and until these are solved you will not be able to view the | ||
9 | contents of them. Actually, you can read in the core file and look at | ||
10 | the contents of the user struct to find out what the floating point | ||
11 | registers contain. | ||
12 | The actual file contents are as follows: | ||
13 | UPAGE: 1 page consisting of a user struct that tells gdb what is present | ||
14 | in the file. Directly after this is a copy of the task_struct, which | ||
15 | is currently not used by gdb, but it may come in useful at some point. | ||
16 | All of the registers are stored as part of the upage. The upage should | ||
17 | always be only one page. | ||
18 | DATA: The data area is stored. We use current->end_text to | ||
19 | current->brk to pick up all of the user variables, plus any memory | ||
20 | that may have been malloced. No attempt is made to determine if a page | ||
21 | is demand-zero or if a page is totally unused, we just cover the entire | ||
22 | range. All of the addresses are rounded in such a way that an integral | ||
23 | number of pages is written. | ||
24 | STACK: We need the stack information in order to get a meaningful | ||
25 | backtrace. We need to write the data from (esp) to | ||
26 | current->start_stack, so we round each of these off in order to be able | ||
27 | to write an integer number of pages. | ||
28 | The minimum core file size is 3 pages, or 12288 bytes. | ||
29 | */ | ||
30 | |||
31 | struct user_m68kfp_struct { | ||
32 | unsigned long fpregs[8*3]; /* fp0-fp7 registers */ | ||
33 | unsigned long fpcntl[3]; /* fp control regs */ | ||
34 | }; | ||
35 | |||
36 | /* This is the old layout of "struct pt_regs" as of Linux 1.x, and | ||
37 | is still the layout used by user (the new pt_regs doesn't have | ||
38 | all registers). */ | ||
39 | struct user_regs_struct { | ||
40 | long d1,d2,d3,d4,d5,d6,d7; | ||
41 | long a0,a1,a2,a3,a4,a5,a6; | ||
42 | long d0; | ||
43 | long usp; | ||
44 | long orig_d0; | ||
45 | short stkadj; | ||
46 | short sr; | ||
47 | long pc; | ||
48 | short fmtvec; | ||
49 | short __fill; | ||
50 | }; | ||
51 | |||
52 | |||
53 | /* When the kernel dumps core, it starts by dumping the user struct - | ||
54 | this will be used by gdb to figure out where the data and stack segments | ||
55 | are within the file, and what virtual addresses to use. */ | ||
56 | struct user{ | ||
57 | /* We start with the registers, to mimic the way that "memory" is returned | ||
58 | from the ptrace(3,...) function. */ | ||
59 | struct user_regs_struct regs; /* Where the registers are actually stored */ | ||
60 | /* ptrace does not yet supply these. Someday.... */ | ||
61 | int u_fpvalid; /* True if math co-processor being used. */ | ||
62 | /* for this mess. Not yet used. */ | ||
63 | struct user_m68kfp_struct m68kfp; /* Math Co-processor registers. */ | ||
64 | /* The rest of this junk is to help gdb figure out what goes where */ | ||
65 | unsigned long int u_tsize; /* Text segment size (pages). */ | ||
66 | unsigned long int u_dsize; /* Data segment size (pages). */ | ||
67 | unsigned long int u_ssize; /* Stack segment size (pages). */ | ||
68 | unsigned long start_code; /* Starting virtual address of text. */ | ||
69 | unsigned long start_stack; /* Starting virtual address of stack area. | ||
70 | This is actually the bottom of the stack, | ||
71 | the top of the stack is always found in the | ||
72 | esp register. */ | ||
73 | long int signal; /* Signal that caused the core dump. */ | ||
74 | int reserved; /* No longer used */ | ||
75 | unsigned long u_ar0; /* Used by gdb to help find the values for */ | ||
76 | /* the registers. */ | ||
77 | struct user_m68kfp_struct* u_fpstate; /* Math Co-processor pointer. */ | ||
78 | unsigned long magic; /* To uniquely identify a core file */ | ||
79 | char u_comm[32]; /* User command that was responsible */ | ||
80 | }; | ||
81 | #define NBPG 4096 | ||
82 | #define UPAGES 1 | ||
83 | #define HOST_TEXT_START_ADDR (u.start_code) | ||
84 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | ||
85 | |||
86 | #endif | ||
diff --git a/include/asm-m68k/virtconvert.h b/include/asm-m68k/virtconvert.h deleted file mode 100644 index 22ab05c9c52b..000000000000 --- a/include/asm-m68k/virtconvert.h +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | #ifndef __VIRT_CONVERT__ | ||
2 | #define __VIRT_CONVERT__ | ||
3 | |||
4 | /* | ||
5 | * Macros used for converting between virtual and physical mappings. | ||
6 | */ | ||
7 | |||
8 | #ifdef __KERNEL__ | ||
9 | |||
10 | #include <linux/compiler.h> | ||
11 | #include <linux/mmzone.h> | ||
12 | #include <asm/setup.h> | ||
13 | #include <asm/page.h> | ||
14 | |||
15 | /* | ||
16 | * Change virtual addresses to physical addresses and vv. | ||
17 | */ | ||
18 | static inline unsigned long virt_to_phys(void *address) | ||
19 | { | ||
20 | return __pa(address); | ||
21 | } | ||
22 | |||
23 | static inline void *phys_to_virt(unsigned long address) | ||
24 | { | ||
25 | return __va(address); | ||
26 | } | ||
27 | |||
28 | /* Permanent address of a page. */ | ||
29 | #ifdef CONFIG_SINGLE_MEMORY_CHUNK | ||
30 | #define page_to_phys(page) \ | ||
31 | __pa(PAGE_OFFSET + (((page) - pg_data_map[0].node_mem_map) << PAGE_SHIFT)) | ||
32 | #else | ||
33 | #define page_to_phys(_page) ({ \ | ||
34 | struct page *__page = _page; \ | ||
35 | struct pglist_data *pgdat; \ | ||
36 | pgdat = pg_data_table[page_to_nid(__page)]; \ | ||
37 | page_to_pfn(__page) << PAGE_SHIFT; \ | ||
38 | }) | ||
39 | #endif | ||
40 | |||
41 | /* | ||
42 | * IO bus memory addresses are 1:1 with the physical address, | ||
43 | */ | ||
44 | #define virt_to_bus virt_to_phys | ||
45 | #define bus_to_virt phys_to_virt | ||
46 | |||
47 | #endif | ||
48 | #endif | ||
diff --git a/include/asm-m68k/xor.h b/include/asm-m68k/xor.h deleted file mode 100644 index c82eb12a5b18..000000000000 --- a/include/asm-m68k/xor.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <asm-generic/xor.h> | ||
diff --git a/include/asm-m68k/zorro.h b/include/asm-m68k/zorro.h deleted file mode 100644 index 5ce97c22b582..000000000000 --- a/include/asm-m68k/zorro.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | #ifndef _ASM_M68K_ZORRO_H | ||
2 | #define _ASM_M68K_ZORRO_H | ||
3 | |||
4 | #include <asm/raw_io.h> | ||
5 | |||
6 | #define z_readb raw_inb | ||
7 | #define z_readw raw_inw | ||
8 | #define z_readl raw_inl | ||
9 | |||
10 | #define z_writeb raw_outb | ||
11 | #define z_writew raw_outw | ||
12 | #define z_writel raw_outl | ||
13 | |||
14 | #define z_memset_io(a,b,c) memset((void *)(a),(b),(c)) | ||
15 | #define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) | ||
16 | #define z_memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) | ||
17 | |||
18 | static inline void __iomem *z_remap_nocache_ser(unsigned long physaddr, | ||
19 | unsigned long size) | ||
20 | { | ||
21 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
22 | } | ||
23 | |||
24 | static inline void __iomem *z_remap_nocache_nonser(unsigned long physaddr, | ||
25 | unsigned long size) | ||
26 | { | ||
27 | return __ioremap(physaddr, size, IOMAP_NOCACHE_NONSER); | ||
28 | } | ||
29 | |||
30 | static inline void __iomem *z_remap_writethrough(unsigned long physaddr, | ||
31 | unsigned long size) | ||
32 | { | ||
33 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
34 | } | ||
35 | static inline void __iomem *z_remap_fullcache(unsigned long physaddr, | ||
36 | unsigned long size) | ||
37 | { | ||
38 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); | ||
39 | } | ||
40 | |||
41 | #define z_unmap iounmap | ||
42 | #define z_iounmap iounmap | ||
43 | #define z_ioremap z_remap_nocache_ser | ||
44 | |||
45 | #endif /* _ASM_M68K_ZORRO_H */ | ||
diff --git a/include/asm-mn10300/Kbuild b/include/asm-mn10300/Kbuild index 27b108a86b39..c68e1680da01 100644 --- a/include/asm-mn10300/Kbuild +++ b/include/asm-mn10300/Kbuild | |||
@@ -1,2 +1 @@ | |||
1 | include include/asm-generic/Kbuild.asm | include include/asm-generic/Kbuild.asm | |
2 | unifdef-y += swab.h | ||
diff --git a/include/asm-mn10300/byteorder.h b/include/asm-mn10300/byteorder.h index 45b18ded19e6..5dd0bdd9feee 100644 --- a/include/asm-mn10300/byteorder.h +++ b/include/asm-mn10300/byteorder.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ASM_BYTEORDER_H | 1 | #ifndef _ASM_BYTEORDER_H |
2 | #define _ASM_BYTEORDER_H | 2 | #define _ASM_BYTEORDER_H |
3 | 3 | ||
4 | #include <asm/swab.h> | ||
5 | #include <linux/byteorder/little_endian.h> | 4 | #include <linux/byteorder/little_endian.h> |
6 | 5 | ||
7 | #endif /* _ASM_BYTEORDER_H */ | 6 | #endif /* _ASM_BYTEORDER_H */ |
diff --git a/include/drm/drm.h b/include/drm/drm.h index 32e5096554e9..8e77357334ad 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h | |||
@@ -458,7 +458,7 @@ enum drm_vblank_seq_type { | |||
458 | _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ | 458 | _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ |
459 | _DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ | 459 | _DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ |
460 | _DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ | 460 | _DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ |
461 | _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking */ | 461 | _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking, unsupported */ |
462 | }; | 462 | }; |
463 | 463 | ||
464 | #define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE) | 464 | #define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE) |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index afb7858c068d..8190b9bcc2d9 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -545,13 +545,6 @@ struct drm_ctx_list { | |||
545 | struct drm_file *tag; /**< associated fd private data */ | 545 | struct drm_file *tag; /**< associated fd private data */ |
546 | }; | 546 | }; |
547 | 547 | ||
548 | struct drm_vbl_sig { | ||
549 | struct list_head head; | ||
550 | unsigned int sequence; | ||
551 | struct siginfo info; | ||
552 | struct task_struct *task; | ||
553 | }; | ||
554 | |||
555 | /* location of GART table */ | 548 | /* location of GART table */ |
556 | #define DRM_ATI_GART_MAIN 1 | 549 | #define DRM_ATI_GART_MAIN 1 |
557 | #define DRM_ATI_GART_FB 2 | 550 | #define DRM_ATI_GART_FB 2 |
@@ -903,8 +896,6 @@ struct drm_device { | |||
903 | wait_queue_head_t *vbl_queue; /**< VBLANK wait queue */ | 896 | wait_queue_head_t *vbl_queue; /**< VBLANK wait queue */ |
904 | atomic_t *_vblank_count; /**< number of VBLANK interrupts (driver must alloc the right number of counters) */ | 897 | atomic_t *_vblank_count; /**< number of VBLANK interrupts (driver must alloc the right number of counters) */ |
905 | spinlock_t vbl_lock; | 898 | spinlock_t vbl_lock; |
906 | struct list_head *vbl_sigs; /**< signal list to send on VBLANK */ | ||
907 | atomic_t vbl_signal_pending; /* number of signals pending on all crtcs*/ | ||
908 | atomic_t *vblank_refcount; /* number of users of vblank interruptsper crtc */ | 899 | atomic_t *vblank_refcount; /* number of users of vblank interruptsper crtc */ |
909 | u32 *last_vblank; /* protected by dev->vbl_lock, used */ | 900 | u32 *last_vblank; /* protected by dev->vbl_lock, used */ |
910 | /* for wraparound handling */ | 901 | /* for wraparound handling */ |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 0acb07f31fa4..d54de24bf371 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -395,7 +395,7 @@ struct drm_connector_funcs { | |||
395 | void (*save)(struct drm_connector *connector); | 395 | void (*save)(struct drm_connector *connector); |
396 | void (*restore)(struct drm_connector *connector); | 396 | void (*restore)(struct drm_connector *connector); |
397 | enum drm_connector_status (*detect)(struct drm_connector *connector); | 397 | enum drm_connector_status (*detect)(struct drm_connector *connector); |
398 | void (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height); | 398 | int (*fill_modes)(struct drm_connector *connector, uint32_t max_width, uint32_t max_height); |
399 | int (*set_property)(struct drm_connector *connector, struct drm_property *property, | 399 | int (*set_property)(struct drm_connector *connector, struct drm_property *property, |
400 | uint64_t val); | 400 | uint64_t val); |
401 | void (*destroy)(struct drm_connector *connector); | 401 | void (*destroy)(struct drm_connector *connector); |
@@ -528,7 +528,8 @@ struct drm_mode_group { | |||
528 | * | 528 | * |
529 | */ | 529 | */ |
530 | struct drm_mode_config { | 530 | struct drm_mode_config { |
531 | struct mutex mutex; /* protects configuration and IDR */ | 531 | struct mutex mutex; /* protects configuration (mode lists etc.) */ |
532 | struct mutex idr_mutex; /* for IDR management */ | ||
532 | struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */ | 533 | struct idr crtc_idr; /* use this idr for all IDs, fb, crtc, connector, modes - just makes life easier */ |
533 | /* this is limited to one for now */ | 534 | /* this is limited to one for now */ |
534 | int num_fb; | 535 | int num_fb; |
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 4bc04cf460a7..0c6f0e11b41b 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -88,7 +88,7 @@ struct drm_connector_helper_funcs { | |||
88 | struct drm_encoder *(*best_encoder)(struct drm_connector *connector); | 88 | struct drm_encoder *(*best_encoder)(struct drm_connector *connector); |
89 | }; | 89 | }; |
90 | 90 | ||
91 | extern void drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); | 91 | extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); |
92 | extern void drm_helper_disable_unused_functions(struct drm_device *dev); | 92 | extern void drm_helper_disable_unused_functions(struct drm_device *dev); |
93 | extern int drm_helper_hotplug_stage_two(struct drm_device *dev); | 93 | extern int drm_helper_hotplug_stage_two(struct drm_device *dev); |
94 | extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow); | 94 | extern bool drm_helper_initial_config(struct drm_device *dev, bool can_grow); |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 12e9a2957caf..2124c063a7ef 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -41,6 +41,7 @@ header-y += baycom.h | |||
41 | header-y += bfs_fs.h | 41 | header-y += bfs_fs.h |
42 | header-y += blkpg.h | 42 | header-y += blkpg.h |
43 | header-y += bpqether.h | 43 | header-y += bpqether.h |
44 | header-y += bsg.h | ||
44 | header-y += can.h | 45 | header-y += can.h |
45 | header-y += cdk.h | 46 | header-y += cdk.h |
46 | header-y += chio.h | 47 | header-y += chio.h |
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index c8fdb6e658e1..110c600c885f 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h | |||
@@ -52,7 +52,6 @@ | |||
52 | 52 | ||
53 | #ifndef __KERNEL__ | 53 | #ifndef __KERNEL__ |
54 | #include <linux/types.h> | 54 | #include <linux/types.h> |
55 | #include <asm/types.h> | ||
56 | 55 | ||
57 | struct agp_version { | 56 | struct agp_version { |
58 | __u16 major; | 57 | __u16 major; |
diff --git a/include/linux/aio_abi.h b/include/linux/aio_abi.h index 9e0172931315..2c8731664180 100644 --- a/include/linux/aio_abi.h +++ b/include/linux/aio_abi.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #ifndef __LINUX__AIO_ABI_H | 27 | #ifndef __LINUX__AIO_ABI_H |
28 | #define __LINUX__AIO_ABI_H | 28 | #define __LINUX__AIO_ABI_H |
29 | 29 | ||
30 | #include <linux/types.h> | ||
30 | #include <asm/byteorder.h> | 31 | #include <asm/byteorder.h> |
31 | 32 | ||
32 | typedef unsigned long aio_context_t; | 33 | typedef unsigned long aio_context_t; |
diff --git a/include/linux/atalk.h b/include/linux/atalk.h index e9ebac2e2ecc..d34c187432ed 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_ATALK_H__ | 1 | #ifndef __LINUX_ATALK_H__ |
2 | #define __LINUX_ATALK_H__ | 2 | #define __LINUX_ATALK_H__ |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <asm/byteorder.h> | 5 | #include <asm/byteorder.h> |
5 | 6 | ||
6 | /* | 7 | /* |
diff --git a/include/linux/atm_idt77105.h b/include/linux/atm_idt77105.h index 05621cf20709..8b724000aa50 100644 --- a/include/linux/atm_idt77105.h +++ b/include/linux/atm_idt77105.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef LINUX_ATM_IDT77105_H | 7 | #ifndef LINUX_ATM_IDT77105_H |
8 | #define LINUX_ATM_IDT77105_H | 8 | #define LINUX_ATM_IDT77105_H |
9 | 9 | ||
10 | #include <asm/types.h> | 10 | #include <linux/types.h> |
11 | #include <linux/atmioc.h> | 11 | #include <linux/atmioc.h> |
12 | #include <linux/atmdev.h> | 12 | #include <linux/atmdev.h> |
13 | 13 | ||
diff --git a/include/linux/atmbr2684.h b/include/linux/atmbr2684.h index 52bf72affbba..fdb2629b6189 100644 --- a/include/linux/atmbr2684.h +++ b/include/linux/atmbr2684.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _LINUX_ATMBR2684_H | 1 | #ifndef _LINUX_ATMBR2684_H |
2 | #define _LINUX_ATMBR2684_H | 2 | #define _LINUX_ATMBR2684_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/atm.h> | 5 | #include <linux/atm.h> |
5 | #include <linux/if.h> /* For IFNAMSIZ */ | 6 | #include <linux/if.h> /* For IFNAMSIZ */ |
6 | 7 | ||
diff --git a/include/linux/auto_fs4.h b/include/linux/auto_fs4.h index 55fa478bd639..8b49ac48a5b7 100644 --- a/include/linux/auto_fs4.h +++ b/include/linux/auto_fs4.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #define _LINUX_AUTO_FS4_H | 12 | #define _LINUX_AUTO_FS4_H |
13 | 13 | ||
14 | /* Include common v3 definitions */ | 14 | /* Include common v3 definitions */ |
15 | #include <linux/types.h> | ||
15 | #include <linux/auto_fs.h> | 16 | #include <linux/auto_fs.h> |
16 | 17 | ||
17 | /* autofs v4 definitions */ | 18 | /* autofs v4 definitions */ |
diff --git a/include/linux/bfs_fs.h b/include/linux/bfs_fs.h index 8ed6dfdcd783..1c0b355aa515 100644 --- a/include/linux/bfs_fs.h +++ b/include/linux/bfs_fs.h | |||
@@ -6,6 +6,8 @@ | |||
6 | #ifndef _LINUX_BFS_FS_H | 6 | #ifndef _LINUX_BFS_FS_H |
7 | #define _LINUX_BFS_FS_H | 7 | #define _LINUX_BFS_FS_H |
8 | 8 | ||
9 | #include <linux/types.h> | ||
10 | |||
9 | #define BFS_BSIZE_BITS 9 | 11 | #define BFS_BSIZE_BITS 9 |
10 | #define BFS_BSIZE (1<<BFS_BSIZE_BITS) | 12 | #define BFS_BSIZE (1<<BFS_BSIZE_BITS) |
11 | 13 | ||
@@ -17,7 +19,6 @@ | |||
17 | #define BFS_VDIR 2L | 19 | #define BFS_VDIR 2L |
18 | #define BFS_VREG 1L | 20 | #define BFS_VREG 1L |
19 | 21 | ||
20 | |||
21 | /* BFS inode layout on disk */ | 22 | /* BFS inode layout on disk */ |
22 | struct bfs_inode { | 23 | struct bfs_inode { |
23 | __le16 i_ino; | 24 | __le16 i_ino; |
diff --git a/include/linux/bio.h b/include/linux/bio.h index 18462c5b8fff..2aa283ab062b 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -144,7 +144,7 @@ struct bio { | |||
144 | * bit 1 -- rw-ahead when set | 144 | * bit 1 -- rw-ahead when set |
145 | * bit 2 -- barrier | 145 | * bit 2 -- barrier |
146 | * Insert a serialization point in the IO queue, forcing previously | 146 | * Insert a serialization point in the IO queue, forcing previously |
147 | * submitted IO to be completed before this oen is issued. | 147 | * submitted IO to be completed before this one is issued. |
148 | * bit 3 -- synchronous I/O hint: the block layer will unplug immediately | 148 | * bit 3 -- synchronous I/O hint: the block layer will unplug immediately |
149 | * Note that this does NOT indicate that the IO itself is sync, just | 149 | * Note that this does NOT indicate that the IO itself is sync, just |
150 | * that the block layer will not postpone issue of this IO by plugging. | 150 | * that the block layer will not postpone issue of this IO by plugging. |
@@ -163,12 +163,33 @@ struct bio { | |||
163 | #define BIO_RW 0 /* Must match RW in req flags (blkdev.h) */ | 163 | #define BIO_RW 0 /* Must match RW in req flags (blkdev.h) */ |
164 | #define BIO_RW_AHEAD 1 /* Must match FAILFAST in req flags */ | 164 | #define BIO_RW_AHEAD 1 /* Must match FAILFAST in req flags */ |
165 | #define BIO_RW_BARRIER 2 | 165 | #define BIO_RW_BARRIER 2 |
166 | #define BIO_RW_SYNC 3 | 166 | #define BIO_RW_SYNCIO 3 |
167 | #define BIO_RW_META 4 | 167 | #define BIO_RW_UNPLUG 4 |
168 | #define BIO_RW_DISCARD 5 | 168 | #define BIO_RW_META 5 |
169 | #define BIO_RW_FAILFAST_DEV 6 | 169 | #define BIO_RW_DISCARD 6 |
170 | #define BIO_RW_FAILFAST_TRANSPORT 7 | 170 | #define BIO_RW_FAILFAST_DEV 7 |
171 | #define BIO_RW_FAILFAST_DRIVER 8 | 171 | #define BIO_RW_FAILFAST_TRANSPORT 8 |
172 | #define BIO_RW_FAILFAST_DRIVER 9 | ||
173 | |||
174 | #define BIO_RW_SYNC (BIO_RW_SYNCIO | BIO_RW_UNPLUG) | ||
175 | |||
176 | #define bio_rw_flagged(bio, flag) ((bio)->bi_rw & (1 << (flag))) | ||
177 | |||
178 | /* | ||
179 | * Old defines, these should eventually be replaced by direct usage of | ||
180 | * bio_rw_flagged() | ||
181 | */ | ||
182 | #define bio_barrier(bio) bio_rw_flagged(bio, BIO_RW_BARRIER) | ||
183 | #define bio_sync(bio) bio_rw_flagged(bio, BIO_RW_SYNCIO) | ||
184 | #define bio_unplug(bio) bio_rw_flagged(bio, BIO_RW_UNPLUG) | ||
185 | #define bio_failfast_dev(bio) bio_rw_flagged(bio, BIO_RW_FAILFAST_DEV) | ||
186 | #define bio_failfast_transport(bio) \ | ||
187 | bio_rw_flagged(bio, BIO_RW_FAILFAST_TRANSPORT) | ||
188 | #define bio_failfast_driver(bio) \ | ||
189 | bio_rw_flagged(bio, BIO_RW_FAILFAST_DRIVER) | ||
190 | #define bio_rw_ahead(bio) bio_rw_flagged(bio, BIO_RW_AHEAD) | ||
191 | #define bio_rw_meta(bio) bio_rw_flagged(bio, BIO_RW_META) | ||
192 | #define bio_discard(bio) bio_rw_flagged(bio, BIO_RW_DISCARD) | ||
172 | 193 | ||
173 | /* | 194 | /* |
174 | * upper 16 bits of bi_rw define the io priority of this bio | 195 | * upper 16 bits of bi_rw define the io priority of this bio |
@@ -193,15 +214,6 @@ struct bio { | |||
193 | #define bio_offset(bio) bio_iovec((bio))->bv_offset | 214 | #define bio_offset(bio) bio_iovec((bio))->bv_offset |
194 | #define bio_segments(bio) ((bio)->bi_vcnt - (bio)->bi_idx) | 215 | #define bio_segments(bio) ((bio)->bi_vcnt - (bio)->bi_idx) |
195 | #define bio_sectors(bio) ((bio)->bi_size >> 9) | 216 | #define bio_sectors(bio) ((bio)->bi_size >> 9) |
196 | #define bio_barrier(bio) ((bio)->bi_rw & (1 << BIO_RW_BARRIER)) | ||
197 | #define bio_sync(bio) ((bio)->bi_rw & (1 << BIO_RW_SYNC)) | ||
198 | #define bio_failfast_dev(bio) ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_DEV)) | ||
199 | #define bio_failfast_transport(bio) \ | ||
200 | ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_TRANSPORT)) | ||
201 | #define bio_failfast_driver(bio) ((bio)->bi_rw & (1 << BIO_RW_FAILFAST_DRIVER)) | ||
202 | #define bio_rw_ahead(bio) ((bio)->bi_rw & (1 << BIO_RW_AHEAD)) | ||
203 | #define bio_rw_meta(bio) ((bio)->bi_rw & (1 << BIO_RW_META)) | ||
204 | #define bio_discard(bio) ((bio)->bi_rw & (1 << BIO_RW_DISCARD)) | ||
205 | #define bio_empty_barrier(bio) (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio)) | 217 | #define bio_empty_barrier(bio) (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio)) |
206 | 218 | ||
207 | static inline unsigned int bio_cur_sectors(struct bio *bio) | 219 | static inline unsigned int bio_cur_sectors(struct bio *bio) |
@@ -312,7 +324,6 @@ struct bio_integrity_payload { | |||
312 | void *bip_buf; /* generated integrity data */ | 324 | void *bip_buf; /* generated integrity data */ |
313 | bio_end_io_t *bip_end_io; /* saved I/O completion fn */ | 325 | bio_end_io_t *bip_end_io; /* saved I/O completion fn */ |
314 | 326 | ||
315 | int bip_error; /* saved I/O error */ | ||
316 | unsigned int bip_size; | 327 | unsigned int bip_size; |
317 | 328 | ||
318 | unsigned short bip_pool; /* pool the ivec came from */ | 329 | unsigned short bip_pool; /* pool the ivec came from */ |
@@ -440,12 +451,13 @@ extern struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly; | |||
440 | 451 | ||
441 | #ifdef CONFIG_HIGHMEM | 452 | #ifdef CONFIG_HIGHMEM |
442 | /* | 453 | /* |
443 | * remember to add offset! and never ever reenable interrupts between a | 454 | * remember never ever reenable interrupts between a bvec_kmap_irq and |
444 | * bvec_kmap_irq and bvec_kunmap_irq!! | 455 | * bvec_kunmap_irq! |
445 | * | 456 | * |
446 | * This function MUST be inlined - it plays with the CPU interrupt flags. | 457 | * This function MUST be inlined - it plays with the CPU interrupt flags. |
447 | */ | 458 | */ |
448 | static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) | 459 | static __always_inline char *bvec_kmap_irq(struct bio_vec *bvec, |
460 | unsigned long *flags) | ||
449 | { | 461 | { |
450 | unsigned long addr; | 462 | unsigned long addr; |
451 | 463 | ||
@@ -461,7 +473,8 @@ static inline char *bvec_kmap_irq(struct bio_vec *bvec, unsigned long *flags) | |||
461 | return (char *) addr + bvec->bv_offset; | 473 | return (char *) addr + bvec->bv_offset; |
462 | } | 474 | } |
463 | 475 | ||
464 | static inline void bvec_kunmap_irq(char *buffer, unsigned long *flags) | 476 | static __always_inline void bvec_kunmap_irq(char *buffer, |
477 | unsigned long *flags) | ||
465 | { | 478 | { |
466 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; | 479 | unsigned long ptr = (unsigned long) buffer & PAGE_MASK; |
467 | 480 | ||
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 044467ef7b11..dcaa0fd84b02 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -108,6 +108,7 @@ enum rq_flag_bits { | |||
108 | __REQ_RW_META, /* metadata io request */ | 108 | __REQ_RW_META, /* metadata io request */ |
109 | __REQ_COPY_USER, /* contains copies of user pages */ | 109 | __REQ_COPY_USER, /* contains copies of user pages */ |
110 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ | 110 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ |
111 | __REQ_UNPLUG, /* unplug queue on submission */ | ||
111 | __REQ_NR_BITS, /* stops here */ | 112 | __REQ_NR_BITS, /* stops here */ |
112 | }; | 113 | }; |
113 | 114 | ||
@@ -134,6 +135,7 @@ enum rq_flag_bits { | |||
134 | #define REQ_RW_META (1 << __REQ_RW_META) | 135 | #define REQ_RW_META (1 << __REQ_RW_META) |
135 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) | 136 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) |
136 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) | 137 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) |
138 | #define REQ_UNPLUG (1 << __REQ_UNPLUG) | ||
137 | 139 | ||
138 | #define BLK_MAX_CDB 16 | 140 | #define BLK_MAX_CDB 16 |
139 | 141 | ||
@@ -449,6 +451,11 @@ struct request_queue | |||
449 | #define QUEUE_FLAG_STACKABLE 13 /* supports request stacking */ | 451 | #define QUEUE_FLAG_STACKABLE 13 /* supports request stacking */ |
450 | #define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */ | 452 | #define QUEUE_FLAG_NONROT 14 /* non-rotational device (SSD) */ |
451 | #define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */ | 453 | #define QUEUE_FLAG_VIRT QUEUE_FLAG_NONROT /* paravirt device */ |
454 | #define QUEUE_FLAG_IO_STAT 15 /* do IO stats */ | ||
455 | |||
456 | #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ | ||
457 | (1 << QUEUE_FLAG_CLUSTER) | \ | ||
458 | (1 << QUEUE_FLAG_STACKABLE)) | ||
452 | 459 | ||
453 | static inline int queue_is_locked(struct request_queue *q) | 460 | static inline int queue_is_locked(struct request_queue *q) |
454 | { | 461 | { |
@@ -565,6 +572,7 @@ enum { | |||
565 | #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) | 572 | #define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) |
566 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) | 573 | #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) |
567 | #define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags) | 574 | #define blk_queue_nonrot(q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags) |
575 | #define blk_queue_io_stat(q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags) | ||
568 | #define blk_queue_flushing(q) ((q)->ordseq) | 576 | #define blk_queue_flushing(q) ((q)->ordseq) |
569 | #define blk_queue_stackable(q) \ | 577 | #define blk_queue_stackable(q) \ |
570 | test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags) | 578 | test_bit(QUEUE_FLAG_STACKABLE, &(q)->queue_flags) |
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 1dba3493d520..25379cba2370 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef BLKTRACE_H | 1 | #ifndef BLKTRACE_H |
2 | #define BLKTRACE_H | 2 | #define BLKTRACE_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
5 | #include <linux/blkdev.h> | 6 | #include <linux/blkdev.h> |
6 | #include <linux/relay.h> | 7 | #include <linux/relay.h> |
diff --git a/include/linux/can/bcm.h b/include/linux/can/bcm.h index 7f293273c444..1432b278c52d 100644 --- a/include/linux/can/bcm.h +++ b/include/linux/can/bcm.h | |||
@@ -14,6 +14,8 @@ | |||
14 | #ifndef CAN_BCM_H | 14 | #ifndef CAN_BCM_H |
15 | #define CAN_BCM_H | 15 | #define CAN_BCM_H |
16 | 16 | ||
17 | #include <linux/types.h> | ||
18 | |||
17 | /** | 19 | /** |
18 | * struct bcm_msg_head - head of messages to/from the broadcast manager | 20 | * struct bcm_msg_head - head of messages to/from the broadcast manager |
19 | * @opcode: opcode, see enum below. | 21 | * @opcode: opcode, see enum below. |
diff --git a/include/linux/capability.h b/include/linux/capability.h index 02bdb768d43b..1b9872556131 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct { | |||
69 | #define VFS_CAP_U32 VFS_CAP_U32_2 | 69 | #define VFS_CAP_U32 VFS_CAP_U32_2 |
70 | #define VFS_CAP_REVISION VFS_CAP_REVISION_2 | 70 | #define VFS_CAP_REVISION VFS_CAP_REVISION_2 |
71 | 71 | ||
72 | #ifdef CONFIG_SECURITY_FILE_CAPABILITIES | ||
73 | extern int file_caps_enabled; | ||
74 | #endif | ||
75 | |||
76 | struct vfs_cap_data { | 72 | struct vfs_cap_data { |
77 | __le32 magic_etc; /* Little endian */ | 73 | __le32 magic_etc; /* Little endian */ |
78 | struct { | 74 | struct { |
@@ -96,6 +92,10 @@ struct vfs_cap_data { | |||
96 | #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3 | 92 | #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3 |
97 | #define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3 | 93 | #define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3 |
98 | 94 | ||
95 | #ifdef CONFIG_SECURITY_FILE_CAPABILITIES | ||
96 | extern int file_caps_enabled; | ||
97 | #endif | ||
98 | |||
99 | typedef struct kernel_cap_struct { | 99 | typedef struct kernel_cap_struct { |
100 | __u32 cap[_KERNEL_CAPABILITY_U32S]; | 100 | __u32 cap[_KERNEL_CAPABILITY_U32S]; |
101 | } kernel_cap_t; | 101 | } kernel_cap_t; |
diff --git a/include/linux/capi.h b/include/linux/capi.h index fdebaaa9f66e..65100d6cb89b 100644 --- a/include/linux/capi.h +++ b/include/linux/capi.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef __LINUX_CAPI_H__ | 12 | #ifndef __LINUX_CAPI_H__ |
13 | #define __LINUX_CAPI_H__ | 13 | #define __LINUX_CAPI_H__ |
14 | 14 | ||
15 | #include <asm/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/ioctl.h> | 16 | #include <linux/ioctl.h> |
17 | #ifndef __KERNEL__ | 17 | #ifndef __KERNEL__ |
18 | #include <linux/kernelcapi.h> | 18 | #include <linux/kernelcapi.h> |
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 0b49e08d3cb0..78e904796622 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #ifndef _LINUX_CDROM_H | 11 | #ifndef _LINUX_CDROM_H |
12 | #define _LINUX_CDROM_H | 12 | #define _LINUX_CDROM_H |
13 | 13 | ||
14 | #include <linux/types.h> | ||
14 | #include <asm/byteorder.h> | 15 | #include <asm/byteorder.h> |
15 | 16 | ||
16 | /******************************************************* | 17 | /******************************************************* |
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index e267e62827bb..e4e8e117d27d 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -99,6 +99,7 @@ static inline bool css_tryget(struct cgroup_subsys_state *css) | |||
99 | while (!atomic_inc_not_zero(&css->refcnt)) { | 99 | while (!atomic_inc_not_zero(&css->refcnt)) { |
100 | if (test_bit(CSS_REMOVED, &css->flags)) | 100 | if (test_bit(CSS_REMOVED, &css->flags)) |
101 | return false; | 101 | return false; |
102 | cpu_relax(); | ||
102 | } | 103 | } |
103 | return true; | 104 | return true; |
104 | } | 105 | } |
diff --git a/include/linux/cgroupstats.h b/include/linux/cgroupstats.h index 4f53abf6855d..3753c33160d1 100644 --- a/include/linux/cgroupstats.h +++ b/include/linux/cgroupstats.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #ifndef _LINUX_CGROUPSTATS_H | 15 | #ifndef _LINUX_CGROUPSTATS_H |
16 | #define _LINUX_CGROUPSTATS_H | 16 | #define _LINUX_CGROUPSTATS_H |
17 | 17 | ||
18 | #include <linux/types.h> | ||
18 | #include <linux/taskstats.h> | 19 | #include <linux/taskstats.h> |
19 | 20 | ||
20 | /* | 21 | /* |
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index cea153697ec7..3a1dbba4d3ae 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
@@ -36,6 +36,7 @@ enum clock_event_nofitiers { | |||
36 | CLOCK_EVT_NOTIFY_BROADCAST_EXIT, | 36 | CLOCK_EVT_NOTIFY_BROADCAST_EXIT, |
37 | CLOCK_EVT_NOTIFY_SUSPEND, | 37 | CLOCK_EVT_NOTIFY_SUSPEND, |
38 | CLOCK_EVT_NOTIFY_RESUME, | 38 | CLOCK_EVT_NOTIFY_RESUME, |
39 | CLOCK_EVT_NOTIFY_CPU_DYING, | ||
39 | CLOCK_EVT_NOTIFY_CPU_DEAD, | 40 | CLOCK_EVT_NOTIFY_CPU_DEAD, |
40 | }; | 41 | }; |
41 | 42 | ||
diff --git a/include/linux/compat.h b/include/linux/compat.h index e88f3ecf38b4..3fd2194ff573 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h | |||
@@ -280,5 +280,18 @@ asmlinkage long compat_sys_timerfd_settime(int ufd, int flags, | |||
280 | asmlinkage long compat_sys_timerfd_gettime(int ufd, | 280 | asmlinkage long compat_sys_timerfd_gettime(int ufd, |
281 | struct compat_itimerspec __user *otmr); | 281 | struct compat_itimerspec __user *otmr); |
282 | 282 | ||
283 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page, | ||
284 | __u32 __user *pages, | ||
285 | const int __user *nodes, | ||
286 | int __user *status, | ||
287 | int flags); | ||
288 | asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, | ||
289 | struct compat_timeval __user *t); | ||
290 | asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename, | ||
291 | struct compat_stat __user *statbuf, | ||
292 | int flag); | ||
293 | asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename, | ||
294 | int flags, int mode); | ||
295 | |||
283 | #endif /* CONFIG_COMPAT */ | 296 | #endif /* CONFIG_COMPAT */ |
284 | #endif /* _LINUX_COMPAT_H */ | 297 | #endif /* _LINUX_COMPAT_H */ |
diff --git a/include/linux/connector.h b/include/linux/connector.h index 5c7f9468f753..34f2789d9b9b 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #ifndef __CONNECTOR_H | 22 | #ifndef __CONNECTOR_H |
23 | #define __CONNECTOR_H | 23 | #define __CONNECTOR_H |
24 | 24 | ||
25 | #include <asm/types.h> | 25 | #include <linux/types.h> |
26 | 26 | ||
27 | #define CN_IDX_CONNECTOR 0xffffffff | 27 | #define CN_IDX_CONNECTOR 0xffffffff |
28 | #define CN_VAL_CONNECTOR 0xffffffff | 28 | #define CN_VAL_CONNECTOR 0xffffffff |
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 2d3d1e04ba92..d06fbf286346 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
@@ -150,8 +150,6 @@ struct CYZ_BOOT_CTRL { | |||
150 | * architectures and compilers. | 150 | * architectures and compilers. |
151 | */ | 151 | */ |
152 | 152 | ||
153 | #include <asm/types.h> | ||
154 | |||
155 | typedef __u64 ucdouble; /* 64 bits, unsigned */ | 153 | typedef __u64 ucdouble; /* 64 bits, unsigned */ |
156 | typedef __u32 uclong; /* 32 bits, unsigned */ | 154 | typedef __u32 uclong; /* 32 bits, unsigned */ |
157 | typedef __u16 ucshort; /* 16 bits, unsigned */ | 155 | typedef __u16 ucshort; /* 16 bits, unsigned */ |
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index 23936b16426b..af0e01d4c663 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h | |||
@@ -162,6 +162,13 @@ static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode, | |||
162 | return ERR_PTR(-ENODEV); | 162 | return ERR_PTR(-ENODEV); |
163 | } | 163 | } |
164 | 164 | ||
165 | static inline struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | ||
166 | struct dentry *parent, | ||
167 | size_t *value) | ||
168 | { | ||
169 | return ERR_PTR(-ENODEV); | ||
170 | } | ||
171 | |||
165 | static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode, | 172 | static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode, |
166 | struct dentry *parent, | 173 | struct dentry *parent, |
167 | u32 *value) | 174 | u32 *value) |
diff --git a/include/linux/dlm_plock.h b/include/linux/dlm_plock.h index 18d5fdbceb74..2dd21243104f 100644 --- a/include/linux/dlm_plock.h +++ b/include/linux/dlm_plock.h | |||
@@ -9,6 +9,8 @@ | |||
9 | #ifndef __DLM_PLOCK_DOT_H__ | 9 | #ifndef __DLM_PLOCK_DOT_H__ |
10 | #define __DLM_PLOCK_DOT_H__ | 10 | #define __DLM_PLOCK_DOT_H__ |
11 | 11 | ||
12 | #include <linux/types.h> | ||
13 | |||
12 | #define DLM_PLOCK_MISC_NAME "dlm_plock" | 14 | #define DLM_PLOCK_MISC_NAME "dlm_plock" |
13 | 15 | ||
14 | #define DLM_PLOCK_VERSION_MAJOR 1 | 16 | #define DLM_PLOCK_VERSION_MAJOR 1 |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index c73f1e2b59b7..3e0f64c335c8 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -297,6 +297,11 @@ static inline void async_tx_ack(struct dma_async_tx_descriptor *tx) | |||
297 | tx->flags |= DMA_CTRL_ACK; | 297 | tx->flags |= DMA_CTRL_ACK; |
298 | } | 298 | } |
299 | 299 | ||
300 | static inline void async_tx_clear_ack(struct dma_async_tx_descriptor *tx) | ||
301 | { | ||
302 | tx->flags &= ~DMA_CTRL_ACK; | ||
303 | } | ||
304 | |||
300 | static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx) | 305 | static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx) |
301 | { | 306 | { |
302 | return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK; | 307 | return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK; |
@@ -400,11 +405,16 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, | |||
400 | enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); | 405 | enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); |
401 | #ifdef CONFIG_DMA_ENGINE | 406 | #ifdef CONFIG_DMA_ENGINE |
402 | enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); | 407 | enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); |
408 | void dma_issue_pending_all(void); | ||
403 | #else | 409 | #else |
404 | static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) | 410 | static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) |
405 | { | 411 | { |
406 | return DMA_SUCCESS; | 412 | return DMA_SUCCESS; |
407 | } | 413 | } |
414 | static inline void dma_issue_pending_all(void) | ||
415 | { | ||
416 | do { } while (0); | ||
417 | } | ||
408 | #endif | 418 | #endif |
409 | 419 | ||
410 | /* --- DMA device --- */ | 420 | /* --- DMA device --- */ |
@@ -413,7 +423,6 @@ int dma_async_device_register(struct dma_device *device); | |||
413 | void dma_async_device_unregister(struct dma_device *device); | 423 | void dma_async_device_unregister(struct dma_device *device); |
414 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); | 424 | void dma_run_dependencies(struct dma_async_tx_descriptor *tx); |
415 | struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type); | 425 | struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type); |
416 | void dma_issue_pending_all(void); | ||
417 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) | 426 | #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) |
418 | struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); | 427 | struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); |
419 | void dma_release_channel(struct dma_chan *chan); | 428 | void dma_release_channel(struct dma_chan *chan); |
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 34161907b2f8..d741b9ceb0e0 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
@@ -38,6 +38,7 @@ struct dmi_device { | |||
38 | #ifdef CONFIG_DMI | 38 | #ifdef CONFIG_DMI |
39 | 39 | ||
40 | extern int dmi_check_system(const struct dmi_system_id *list); | 40 | extern int dmi_check_system(const struct dmi_system_id *list); |
41 | const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list); | ||
41 | extern const char * dmi_get_system_info(int field); | 42 | extern const char * dmi_get_system_info(int field); |
42 | extern const struct dmi_device * dmi_find_device(int type, const char *name, | 43 | extern const struct dmi_device * dmi_find_device(int type, const char *name, |
43 | const struct dmi_device *from); | 44 | const struct dmi_device *from); |
@@ -64,6 +65,8 @@ static inline int dmi_walk(void (*decode)(const struct dmi_header *)) | |||
64 | { return -1; } | 65 | { return -1; } |
65 | static inline bool dmi_match(enum dmi_field f, const char *str) | 66 | static inline bool dmi_match(enum dmi_field f, const char *str) |
66 | { return false; } | 67 | { return false; } |
68 | static inline const struct dmi_system_id * | ||
69 | dmi_first_match(const struct dmi_system_id *list) { return NULL; } | ||
67 | 70 | ||
68 | #endif | 71 | #endif |
69 | 72 | ||
diff --git a/include/linux/dn.h b/include/linux/dn.h index 02bba040fcfb..fe9990823193 100644 --- a/include/linux/dn.h +++ b/include/linux/dn.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_DN_H | 1 | #ifndef _LINUX_DN_H |
2 | #define _LINUX_DN_H | 2 | #define _LINUX_DN_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* | 6 | /* |
5 | 7 | ||
6 | DECnet Data Structures and Constants | 8 | DECnet Data Structures and Constants |
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index 89412e18f571..bb0df2aaebfa 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h | |||
@@ -24,12 +24,7 @@ | |||
24 | #ifndef _DVBAUDIO_H_ | 24 | #ifndef _DVBAUDIO_H_ |
25 | #define _DVBAUDIO_H_ | 25 | #define _DVBAUDIO_H_ |
26 | 26 | ||
27 | #ifdef __KERNEL__ | ||
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
29 | #else | ||
30 | #include <stdint.h> | ||
31 | #endif | ||
32 | |||
33 | 28 | ||
34 | typedef enum { | 29 | typedef enum { |
35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ | 30 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ |
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h index 402fb7a8d922..fef943738a24 100644 --- a/include/linux/dvb/dmx.h +++ b/include/linux/dvb/dmx.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef _DVBDMX_H_ | 24 | #ifndef _DVBDMX_H_ |
25 | #define _DVBDMX_H_ | 25 | #define _DVBDMX_H_ |
26 | 26 | ||
27 | #include <asm/types.h> | 27 | #include <linux/types.h> |
28 | #ifdef __KERNEL__ | 28 | #ifdef __KERNEL__ |
29 | #include <linux/time.h> | 29 | #include <linux/time.h> |
30 | #else | 30 | #else |
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index 55026b1a40bd..51c8d2d49e42 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h | |||
@@ -26,8 +26,7 @@ | |||
26 | #ifndef _DVBFRONTEND_H_ | 26 | #ifndef _DVBFRONTEND_H_ |
27 | #define _DVBFRONTEND_H_ | 27 | #define _DVBFRONTEND_H_ |
28 | 28 | ||
29 | #include <asm/types.h> | 29 | #include <linux/types.h> |
30 | |||
31 | 30 | ||
32 | typedef enum fe_type { | 31 | typedef enum fe_type { |
33 | FE_QPSK, | 32 | FE_QPSK, |
diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h index 5be474bf0d2b..f451e7eb0b0b 100644 --- a/include/linux/dvb/net.h +++ b/include/linux/dvb/net.h | |||
@@ -24,8 +24,7 @@ | |||
24 | #ifndef _DVBNET_H_ | 24 | #ifndef _DVBNET_H_ |
25 | #define _DVBNET_H_ | 25 | #define _DVBNET_H_ |
26 | 26 | ||
27 | #include <asm/types.h> | 27 | #include <linux/types.h> |
28 | |||
29 | 28 | ||
30 | struct dvb_net_if { | 29 | struct dvb_net_if { |
31 | __u16 pid; | 30 | __u16 pid; |
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 50839fe9e39e..bd49c3ebf916 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h | |||
@@ -24,17 +24,14 @@ | |||
24 | #ifndef _DVBVIDEO_H_ | 24 | #ifndef _DVBVIDEO_H_ |
25 | #define _DVBVIDEO_H_ | 25 | #define _DVBVIDEO_H_ |
26 | 26 | ||
27 | #include <linux/compiler.h> | ||
28 | |||
29 | #ifdef __KERNEL__ | ||
30 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #ifdef __KERNEL__ | ||
29 | #include <linux/compiler.h> | ||
31 | #else | 30 | #else |
32 | #include <asm/types.h> | ||
33 | #include <stdint.h> | 31 | #include <stdint.h> |
34 | #include <time.h> | 32 | #include <time.h> |
35 | #endif | 33 | #endif |
36 | 34 | ||
37 | |||
38 | typedef enum { | 35 | typedef enum { |
39 | VIDEO_FORMAT_4_3, /* Select 4:3 format */ | 36 | VIDEO_FORMAT_4_3, /* Select 4:3 format */ |
40 | VIDEO_FORMAT_16_9, /* Select 16:9 format. */ | 37 | VIDEO_FORMAT_16_9, /* Select 16:9 format. */ |
diff --git a/include/linux/edd.h b/include/linux/edd.h index 5d747c5cd0fe..4cbd0fe9df08 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h | |||
@@ -30,6 +30,8 @@ | |||
30 | #ifndef _LINUX_EDD_H | 30 | #ifndef _LINUX_EDD_H |
31 | #define _LINUX_EDD_H | 31 | #define _LINUX_EDD_H |
32 | 32 | ||
33 | #include <linux/types.h> | ||
34 | |||
33 | #define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF | 35 | #define EDDNR 0x1e9 /* addr of number of edd_info structs at EDDBUF |
34 | in boot_params - treat this as 1 byte */ | 36 | in boot_params - treat this as 1 byte */ |
35 | #define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */ | 37 | #define EDDBUF 0xd00 /* addr of edd_info structs in boot_params */ |
diff --git a/include/linux/efs_fs_sb.h b/include/linux/efs_fs_sb.h index ff1945e37790..a01be90c58cc 100644 --- a/include/linux/efs_fs_sb.h +++ b/include/linux/efs_fs_sb.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #ifndef __EFS_FS_SB_H__ | 9 | #ifndef __EFS_FS_SB_H__ |
10 | #define __EFS_FS_SB_H__ | 10 | #define __EFS_FS_SB_H__ |
11 | 11 | ||
12 | #include <linux/types.h> | ||
12 | #include <linux/magic.h> | 13 | #include <linux/magic.h> |
13 | 14 | ||
14 | /* EFS superblock magic numbers */ | 15 | /* EFS superblock magic numbers */ |
diff --git a/include/linux/elf-fdpic.h b/include/linux/elf-fdpic.h index 9f5b7456bff3..7cd2e80cebc8 100644 --- a/include/linux/elf-fdpic.h +++ b/include/linux/elf-fdpic.h | |||
@@ -58,11 +58,13 @@ struct elf_fdpic_params { | |||
58 | #define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */ | 58 | #define ELF_FDPIC_FLAG_PRESENT 0x80000000 /* T if this object is present */ |
59 | }; | 59 | }; |
60 | 60 | ||
61 | #ifdef __KERNEL__ | ||
61 | #ifdef CONFIG_MMU | 62 | #ifdef CONFIG_MMU |
62 | extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params, | 63 | extern void elf_fdpic_arch_lay_out_mm(struct elf_fdpic_params *exec_params, |
63 | struct elf_fdpic_params *interp_params, | 64 | struct elf_fdpic_params *interp_params, |
64 | unsigned long *start_stack, | 65 | unsigned long *start_stack, |
65 | unsigned long *start_brk); | 66 | unsigned long *start_brk); |
66 | #endif | 67 | #endif |
68 | #endif /* __KERNEL__ */ | ||
67 | 69 | ||
68 | #endif /* _LINUX_ELF_FDPIC_H */ | 70 | #endif /* _LINUX_ELF_FDPIC_H */ |
diff --git a/include/linux/elf.h b/include/linux/elf.h index 0b61ca41a044..45a937be6d38 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h | |||
@@ -377,6 +377,7 @@ typedef struct elf64_note { | |||
377 | Elf64_Word n_type; /* Content type */ | 377 | Elf64_Word n_type; /* Content type */ |
378 | } Elf64_Nhdr; | 378 | } Elf64_Nhdr; |
379 | 379 | ||
380 | #ifdef __KERNEL__ | ||
380 | #if ELF_CLASS == ELFCLASS32 | 381 | #if ELF_CLASS == ELFCLASS32 |
381 | 382 | ||
382 | extern Elf32_Dyn _DYNAMIC []; | 383 | extern Elf32_Dyn _DYNAMIC []; |
@@ -404,5 +405,5 @@ static inline int elf_coredump_extra_notes_write(struct file *file, | |||
404 | extern int elf_coredump_extra_notes_size(void); | 405 | extern int elf_coredump_extra_notes_size(void); |
405 | extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset); | 406 | extern int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset); |
406 | #endif | 407 | #endif |
407 | 408 | #endif /* __KERNEL__ */ | |
408 | #endif /* _LINUX_ELF_H */ | 409 | #endif /* _LINUX_ELF_H */ |
diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h index 92f8d4fab32b..ceb1454b6977 100644 --- a/include/linux/errqueue.h +++ b/include/linux/errqueue.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_ERRQUEUE_H | 1 | #ifndef _LINUX_ERRQUEUE_H |
2 | #define _LINUX_ERRQUEUE_H 1 | 2 | #define _LINUX_ERRQUEUE_H 1 |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | struct sock_extended_err | 6 | struct sock_extended_err |
5 | { | 7 | { |
6 | __u32 ee_errno; | 8 | __u32 ee_errno; |
diff --git a/include/linux/fb.h b/include/linux/fb.h index 1ee63df5be92..818fe21257e8 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _LINUX_FB_H | 1 | #ifndef _LINUX_FB_H |
2 | #define _LINUX_FB_H | 2 | #define _LINUX_FB_H |
3 | 3 | ||
4 | #include <asm/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/i2c.h> | 5 | #include <linux/i2c.h> |
6 | 6 | ||
7 | struct dentry; | 7 | struct dentry; |
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index 7da02c93002b..b834ef6d59fa 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_GENERIC_NETLINK_H | 1 | #ifndef __LINUX_GENERIC_NETLINK_H |
2 | #define __LINUX_GENERIC_NETLINK_H | 2 | #define __LINUX_GENERIC_NETLINK_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
5 | 6 | ||
6 | #define GENL_NAMSIZ 16 /* length of family name */ | 7 | #define GENL_NAMSIZ 16 /* length of family name */ |
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index 14d0df0b5749..c56b4bce56d0 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h | |||
@@ -10,6 +10,8 @@ | |||
10 | #ifndef __GFS2_ONDISK_DOT_H__ | 10 | #ifndef __GFS2_ONDISK_DOT_H__ |
11 | #define __GFS2_ONDISK_DOT_H__ | 11 | #define __GFS2_ONDISK_DOT_H__ |
12 | 12 | ||
13 | #include <linux/types.h> | ||
14 | |||
13 | #define GFS2_MAGIC 0x01161970 | 15 | #define GFS2_MAGIC 0x01161970 |
14 | #define GFS2_BASIC_BLOCK 512 | 16 | #define GFS2_BASIC_BLOCK 512 |
15 | #define GFS2_BASIC_BLOCK_SHIFT 9 | 17 | #define GFS2_BASIC_BLOCK_SHIFT 9 |
diff --git a/include/linux/hid.h b/include/linux/hid.h index 81aa84d60c6b..fa8ee9cef7be 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...) | |||
791 | __FILE__ , ## arg) | 791 | __FILE__ , ## arg) |
792 | #endif /* HID_FF */ | 792 | #endif /* HID_FF */ |
793 | 793 | ||
794 | #ifdef __KERNEL__ | ||
794 | #ifdef CONFIG_HID_COMPAT | 795 | #ifdef CONFIG_HID_COMPAT |
795 | #define HID_COMPAT_LOAD_DRIVER(name) \ | 796 | #define HID_COMPAT_LOAD_DRIVER(name) \ |
796 | /* prototype to avoid sparse warning */ \ | 797 | /* prototype to avoid sparse warning */ \ |
@@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name) | |||
804 | extern void hid_compat_##name(void); \ | 805 | extern void hid_compat_##name(void); \ |
805 | hid_compat_##name(); \ | 806 | hid_compat_##name(); \ |
806 | } while (0) | 807 | } while (0) |
808 | #endif /* __KERNEL__ */ | ||
807 | 809 | ||
808 | #endif | 810 | #endif |
809 | 811 | ||
diff --git a/include/linux/hiddev.h b/include/linux/hiddev.h index c760ae0eb6a1..bb6f58baf319 100644 --- a/include/linux/hiddev.h +++ b/include/linux/hiddev.h | |||
@@ -27,6 +27,8 @@ | |||
27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic | 27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/types.h> | ||
31 | |||
30 | /* | 32 | /* |
31 | * The event structure itself | 33 | * The event structure itself |
32 | */ | 34 | */ |
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index 01d67ba9e985..1ffc23bc5d1e 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -40,9 +40,7 @@ | |||
40 | #define I2C_DRIVERID_SAA7185B 13 /* video encoder */ | 40 | #define I2C_DRIVERID_SAA7185B 13 /* video encoder */ |
41 | #define I2C_DRIVERID_SAA7110 22 /* video decoder */ | 41 | #define I2C_DRIVERID_SAA7110 22 /* video decoder */ |
42 | #define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */ | 42 | #define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */ |
43 | #define I2C_DRIVERID_PCF8583 25 /* real time clock */ | ||
44 | #define I2C_DRIVERID_TDA7432 27 /* Stereo sound processor */ | 43 | #define I2C_DRIVERID_TDA7432 27 /* Stereo sound processor */ |
45 | #define I2C_DRIVERID_TVMIXER 28 /* Mixer driver for tv cards */ | ||
46 | #define I2C_DRIVERID_TVAUDIO 29 /* Generic TV sound driver */ | 44 | #define I2C_DRIVERID_TVAUDIO 29 /* Generic TV sound driver */ |
47 | #define I2C_DRIVERID_TDA9875 32 /* TV sound decoder chip */ | 45 | #define I2C_DRIVERID_TDA9875 32 /* TV sound decoder chip */ |
48 | #define I2C_DRIVERID_BT819 40 /* video decoder */ | 46 | #define I2C_DRIVERID_BT819 40 /* video decoder */ |
@@ -54,7 +52,6 @@ | |||
54 | #define I2C_DRIVERID_SAA7191 57 /* video decoder */ | 52 | #define I2C_DRIVERID_SAA7191 57 /* video decoder */ |
55 | #define I2C_DRIVERID_INDYCAM 58 /* SGI IndyCam */ | 53 | #define I2C_DRIVERID_INDYCAM 58 /* SGI IndyCam */ |
56 | #define I2C_DRIVERID_OVCAMCHIP 61 /* OmniVision CMOS image sens. */ | 54 | #define I2C_DRIVERID_OVCAMCHIP 61 /* OmniVision CMOS image sens. */ |
57 | #define I2C_DRIVERID_MAX6900 63 /* MAX6900 real-time clock */ | ||
58 | #define I2C_DRIVERID_SAA6752HS 67 /* MPEG2 encoder */ | 55 | #define I2C_DRIVERID_SAA6752HS 67 /* MPEG2 encoder */ |
59 | #define I2C_DRIVERID_TVEEPROM 68 /* TV EEPROM */ | 56 | #define I2C_DRIVERID_TVEEPROM 68 /* TV EEPROM */ |
60 | #define I2C_DRIVERID_WM8775 69 /* wm8775 audio processor */ | 57 | #define I2C_DRIVERID_WM8775 69 /* wm8775 audio processor */ |
@@ -62,23 +59,16 @@ | |||
62 | #define I2C_DRIVERID_CX25840 71 /* cx2584x video encoder */ | 59 | #define I2C_DRIVERID_CX25840 71 /* cx2584x video encoder */ |
63 | #define I2C_DRIVERID_SAA7127 72 /* saa7127 video encoder */ | 60 | #define I2C_DRIVERID_SAA7127 72 /* saa7127 video encoder */ |
64 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | 61 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ |
65 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ | ||
66 | #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ | 62 | #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ |
67 | #define I2C_DRIVERID_TVP5150 76 /* TVP5150 video decoder */ | 63 | #define I2C_DRIVERID_TVP5150 76 /* TVP5150 video decoder */ |
68 | #define I2C_DRIVERID_WM8739 77 /* wm8739 audio processor */ | 64 | #define I2C_DRIVERID_WM8739 77 /* wm8739 audio processor */ |
69 | #define I2C_DRIVERID_UPD64083 78 /* upd64083 video processor */ | 65 | #define I2C_DRIVERID_UPD64083 78 /* upd64083 video processor */ |
70 | #define I2C_DRIVERID_UPD64031A 79 /* upd64031a video processor */ | 66 | #define I2C_DRIVERID_UPD64031A 79 /* upd64031a video processor */ |
71 | #define I2C_DRIVERID_SAA717X 80 /* saa717x video encoder */ | 67 | #define I2C_DRIVERID_SAA717X 80 /* saa717x video encoder */ |
72 | #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ | ||
73 | #define I2C_DRIVERID_BT866 85 /* Conexant bt866 video encoder */ | 68 | #define I2C_DRIVERID_BT866 85 /* Conexant bt866 video encoder */ |
74 | #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ | 69 | #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ |
75 | #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ | 70 | #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ |
76 | #define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ | ||
77 | #define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ | ||
78 | #define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ | ||
79 | #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ | ||
80 | #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ | 71 | #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ |
81 | #define I2C_DRIVERID_CS4270 94 /* Cirrus Logic 4270 audio codec */ | ||
82 | #define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */ | 72 | #define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */ |
83 | #define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */ | 73 | #define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */ |
84 | 74 | ||
@@ -89,74 +79,23 @@ | |||
89 | */ | 79 | */ |
90 | 80 | ||
91 | /* --- Bit algorithm adapters */ | 81 | /* --- Bit algorithm adapters */ |
92 | #define I2C_HW_B_LP 0x010000 /* Parallel port Philips style */ | ||
93 | #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ | 82 | #define I2C_HW_B_BT848 0x010005 /* BT848 video boards */ |
94 | #define I2C_HW_B_VIA 0x010007 /* Via vt82c586b */ | ||
95 | #define I2C_HW_B_HYDRA 0x010008 /* Apple Hydra Mac I/O */ | ||
96 | #define I2C_HW_B_I810 0x01000a /* Intel I810 */ | ||
97 | #define I2C_HW_B_VOO 0x01000b /* 3dfx Voodoo 3 / Banshee */ | ||
98 | #define I2C_HW_B_SCX200 0x01000e /* Nat'l Semi SCx200 I2C */ | ||
99 | #define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */ | 83 | #define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */ |
100 | #define I2C_HW_B_IOC 0x010011 /* IOC bit-wiggling */ | ||
101 | #define I2C_HW_B_IXP2000 0x010016 /* GPIO on IXP2000 systems */ | ||
102 | #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ | 84 | #define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */ |
103 | #define I2C_HW_B_PCILYNX 0x01001a /* TI PCILynx I2C adapter */ | ||
104 | #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ | 85 | #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */ |
105 | #define I2C_HW_B_NVIDIA 0x01001c /* nvidia framebuffer driver */ | ||
106 | #define I2C_HW_B_SAVAGE 0x01001d /* savage framebuffer driver */ | ||
107 | #define I2C_HW_B_RADEON 0x01001e /* radeon framebuffer driver */ | ||
108 | #define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ | 86 | #define I2C_HW_B_EM28XX 0x01001f /* em28xx video capture cards */ |
109 | #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ | 87 | #define I2C_HW_B_CX2341X 0x010020 /* Conexant CX2341X MPEG encoder cards */ |
110 | #define I2C_HW_B_INTELFB 0x010021 /* intel framebuffer driver */ | ||
111 | #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ | 88 | #define I2C_HW_B_CX23885 0x010022 /* conexant 23885 based tv cards (bus1) */ |
112 | #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ | 89 | #define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */ |
113 | 90 | ||
114 | /* --- PCF 8584 based algorithms */ | ||
115 | #define I2C_HW_P_ELEK 0x020002 /* Elektor ISA Bus inteface card */ | ||
116 | |||
117 | /* --- PCA 9564 based algorithms */ | ||
118 | #define I2C_HW_A_ISA 0x1a0000 /* generic ISA Bus interface card */ | ||
119 | |||
120 | /* --- PowerPC on-chip adapters */ | ||
121 | #define I2C_HW_OCP 0x120000 /* IBM on-chip I2C adapter */ | ||
122 | |||
123 | /* --- Broadcom SiByte adapters */ | ||
124 | #define I2C_HW_SIBYTE 0x150000 | ||
125 | |||
126 | /* --- SGI adapters */ | 91 | /* --- SGI adapters */ |
127 | #define I2C_HW_SGI_VINO 0x160000 | 92 | #define I2C_HW_SGI_VINO 0x160000 |
128 | 93 | ||
129 | /* --- XSCALE on-chip adapters */ | ||
130 | #define I2C_HW_IOP3XX 0x140000 | ||
131 | |||
132 | /* --- Au1550 PSC adapters adapters */ | ||
133 | #define I2C_HW_AU1550_PSC 0x1b0000 | ||
134 | |||
135 | /* --- SMBus only adapters */ | 94 | /* --- SMBus only adapters */ |
136 | #define I2C_HW_SMBUS_PIIX4 0x040000 | ||
137 | #define I2C_HW_SMBUS_ALI15X3 0x040001 | ||
138 | #define I2C_HW_SMBUS_VIA2 0x040002 | ||
139 | #define I2C_HW_SMBUS_I801 0x040004 | ||
140 | #define I2C_HW_SMBUS_AMD756 0x040005 | ||
141 | #define I2C_HW_SMBUS_SIS5595 0x040006 | ||
142 | #define I2C_HW_SMBUS_ALI1535 0x040007 | ||
143 | #define I2C_HW_SMBUS_SIS630 0x040008 | ||
144 | #define I2C_HW_SMBUS_SIS96X 0x040009 | ||
145 | #define I2C_HW_SMBUS_AMD8111 0x04000a | ||
146 | #define I2C_HW_SMBUS_SCX200 0x04000b | ||
147 | #define I2C_HW_SMBUS_NFORCE2 0x04000c | ||
148 | #define I2C_HW_SMBUS_W9968CF 0x04000d | 95 | #define I2C_HW_SMBUS_W9968CF 0x04000d |
149 | #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ | 96 | #define I2C_HW_SMBUS_OV511 0x04000e /* OV511(+) USB 1.1 webcam ICs */ |
150 | #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ | 97 | #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ |
151 | #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ | 98 | #define I2C_HW_SMBUS_CAFE 0x040012 /* Marvell 88ALP01 "CAFE" cam */ |
152 | #define I2C_HW_SMBUS_ALI1563 0x040013 | ||
153 | |||
154 | /* --- MCP107 adapter */ | ||
155 | #define I2C_HW_MPC107 0x0d0000 | ||
156 | |||
157 | /* --- Embedded adapters */ | ||
158 | #define I2C_HW_MV64XXX 0x190000 | ||
159 | #define I2C_HW_BLACKFIN 0x190001 /* ADI Blackfin I2C TWI driver */ | ||
160 | 99 | ||
161 | /* --- Miscellaneous adapters */ | 100 | /* --- Miscellaneous adapters */ |
162 | #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ | 101 | #define I2C_HW_SAA7146 0x060000 /* SAA7146 video decoder bus */ |
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 20873d402467..fcfbfea3af72 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -151,7 +151,7 @@ struct i2c_driver { | |||
151 | * has been dynamically allocated by the driver in the function above, | 151 | * has been dynamically allocated by the driver in the function above, |
152 | * it must be freed here. (LEGACY I2C DRIVERS ONLY) | 152 | * it must be freed here. (LEGACY I2C DRIVERS ONLY) |
153 | */ | 153 | */ |
154 | int (*detach_client)(struct i2c_client *); | 154 | int (*detach_client)(struct i2c_client *) __deprecated; |
155 | 155 | ||
156 | /* Standard driver model interfaces, for "new style" i2c drivers. | 156 | /* Standard driver model interfaces, for "new style" i2c drivers. |
157 | * With the driver model, device enumeration is NEVER done by drivers; | 157 | * With the driver model, device enumeration is NEVER done by drivers; |
@@ -429,8 +429,10 @@ static inline int i2c_add_driver(struct i2c_driver *driver) | |||
429 | return i2c_register_driver(THIS_MODULE, driver); | 429 | return i2c_register_driver(THIS_MODULE, driver); |
430 | } | 430 | } |
431 | 431 | ||
432 | extern int i2c_attach_client(struct i2c_client *); | 432 | /* These are deprecated, your driver should use the standard .probe() |
433 | extern int i2c_detach_client(struct i2c_client *); | 433 | * and .remove() methods instead. */ |
434 | extern int __deprecated i2c_attach_client(struct i2c_client *); | ||
435 | extern int __deprecated i2c_detach_client(struct i2c_client *); | ||
434 | 436 | ||
435 | extern struct i2c_client *i2c_use_client(struct i2c_client *client); | 437 | extern struct i2c_client *i2c_use_client(struct i2c_client *client); |
436 | extern void i2c_release_client(struct i2c_client *client); | 438 | extern void i2c_release_client(struct i2c_client *client); |
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index a93a8dd33118..10d701eec484 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _LINUX_ICMPV6_H | 1 | #ifndef _LINUX_ICMPV6_H |
2 | #define _LINUX_ICMPV6_H | 2 | #define _LINUX_ICMPV6_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <asm/byteorder.h> | 5 | #include <asm/byteorder.h> |
5 | 6 | ||
6 | struct icmp6hdr { | 7 | struct icmp6hdr { |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 3644f6323384..194da5a4b0d6 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -871,7 +871,7 @@ struct ide_host { | |||
871 | ide_hwif_t *cur_port; /* for hosts requiring serialization */ | 871 | ide_hwif_t *cur_port; /* for hosts requiring serialization */ |
872 | 872 | ||
873 | /* used for hosts requiring serialization */ | 873 | /* used for hosts requiring serialization */ |
874 | volatile long host_busy; | 874 | volatile unsigned long host_busy; |
875 | }; | 875 | }; |
876 | 876 | ||
877 | #define IDE_HOST_BUSY 0 | 877 | #define IDE_HOST_BUSY 0 |
diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h index 43f3bedaafd3..a60c821be44c 100644 --- a/include/linux/if_addr.h +++ b/include/linux/if_addr.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_IF_ADDR_H | 1 | #ifndef __LINUX_IF_ADDR_H |
2 | #define __LINUX_IF_ADDR_H | 2 | #define __LINUX_IF_ADDR_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
5 | 6 | ||
6 | struct ifaddrmsg | 7 | struct ifaddrmsg |
diff --git a/include/linux/if_addrlabel.h b/include/linux/if_addrlabel.h index 9fe79c95dd28..89571f65d6de 100644 --- a/include/linux/if_addrlabel.h +++ b/include/linux/if_addrlabel.h | |||
@@ -10,6 +10,8 @@ | |||
10 | #ifndef __LINUX_IF_ADDRLABEL_H | 10 | #ifndef __LINUX_IF_ADDRLABEL_H |
11 | #define __LINUX_IF_ADDRLABEL_H | 11 | #define __LINUX_IF_ADDRLABEL_H |
12 | 12 | ||
13 | #include <linux/types.h> | ||
14 | |||
13 | struct ifaddrlblmsg | 15 | struct ifaddrlblmsg |
14 | { | 16 | { |
15 | __u8 ifal_family; /* Address family */ | 17 | __u8 ifal_family; /* Address family */ |
diff --git a/include/linux/if_fc.h b/include/linux/if_fc.h index 376a34ea4723..6ed7f1bf35c8 100644 --- a/include/linux/if_fc.h +++ b/include/linux/if_fc.h | |||
@@ -20,6 +20,7 @@ | |||
20 | #ifndef _LINUX_IF_FC_H | 20 | #ifndef _LINUX_IF_FC_H |
21 | #define _LINUX_IF_FC_H | 21 | #define _LINUX_IF_FC_H |
22 | 22 | ||
23 | #include <linux/types.h> | ||
23 | 24 | ||
24 | #define FC_ALEN 6 /* Octets in one ethernet addr */ | 25 | #define FC_ALEN 6 /* Octets in one ethernet addr */ |
25 | #define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) | 26 | #define FC_HLEN (sizeof(struct fch_hdr)+sizeof(struct fcllc)) |
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 5c34240de746..60e16a551dd6 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include <linux/if.h> | 27 | #include <linux/if.h> |
28 | 28 | ||
29 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) | ||
30 | |||
31 | /* Structures and constants associated with the DLCI device driver */ | 29 | /* Structures and constants associated with the DLCI device driver */ |
32 | 30 | ||
33 | struct dlci_add | 31 | struct dlci_add |
@@ -127,6 +125,8 @@ struct frad_conf | |||
127 | 125 | ||
128 | #ifdef __KERNEL__ | 126 | #ifdef __KERNEL__ |
129 | 127 | ||
128 | #if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) | ||
129 | |||
130 | /* these are the fields of an RFC 1490 header */ | 130 | /* these are the fields of an RFC 1490 header */ |
131 | struct frhdr | 131 | struct frhdr |
132 | { | 132 | { |
@@ -190,12 +190,10 @@ struct frad_local | |||
190 | int buffer; /* current buffer for S508 firmware */ | 190 | int buffer; /* current buffer for S508 firmware */ |
191 | }; | 191 | }; |
192 | 192 | ||
193 | #endif /* __KERNEL__ */ | ||
194 | |||
195 | #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */ | 193 | #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */ |
196 | 194 | ||
197 | #ifdef __KERNEL__ | ||
198 | extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)); | 195 | extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)); |
199 | #endif | 196 | |
197 | #endif /* __KERNEL__ */ | ||
200 | 198 | ||
201 | #endif | 199 | #endif |
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h index f0f23516bb59..4a7c9940b080 100644 --- a/include/linux/if_hippi.h +++ b/include/linux/if_hippi.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #ifndef _LINUX_IF_HIPPI_H | 22 | #ifndef _LINUX_IF_HIPPI_H |
23 | #define _LINUX_IF_HIPPI_H | 23 | #define _LINUX_IF_HIPPI_H |
24 | 24 | ||
25 | #include <linux/types.h> | ||
25 | #include <asm/byteorder.h> | 26 | #include <asm/byteorder.h> |
26 | 27 | ||
27 | /* | 28 | /* |
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index f9032c88716a..176c5182c515 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _LINUX_IF_LINK_H | 1 | #ifndef _LINUX_IF_LINK_H |
2 | #define _LINUX_IF_LINK_H | 2 | #define _LINUX_IF_LINK_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
5 | 6 | ||
6 | /* The struct should be in sync with struct net_device_stats */ | 7 | /* The struct should be in sync with struct net_device_stats */ |
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h index c3b1f8562709..fcef103aa3f6 100644 --- a/include/linux/if_ppp.h +++ b/include/linux/if_ppp.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #ifndef _IF_PPP_H_ | 33 | #ifndef _IF_PPP_H_ |
34 | #define _IF_PPP_H_ | 34 | #define _IF_PPP_H_ |
35 | 35 | ||
36 | #include <linux/types.h> | ||
36 | #include <linux/compiler.h> | 37 | #include <linux/compiler.h> |
37 | 38 | ||
38 | /* | 39 | /* |
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h index a7d6a2234b31..c7a66882b6d0 100644 --- a/include/linux/if_pppol2tp.h +++ b/include/linux/if_pppol2tp.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #ifndef __LINUX_IF_PPPOL2TP_H | 15 | #ifndef __LINUX_IF_PPPOL2TP_H |
16 | #define __LINUX_IF_PPPOL2TP_H | 16 | #define __LINUX_IF_PPPOL2TP_H |
17 | 17 | ||
18 | #include <asm/types.h> | 18 | #include <linux/types.h> |
19 | 19 | ||
20 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
21 | #include <linux/in.h> | 21 | #include <linux/in.h> |
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 6fb7f1788570..30c88b2245ff 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #define __LINUX_IF_PPPOX_H | 17 | #define __LINUX_IF_PPPOX_H |
18 | 18 | ||
19 | 19 | ||
20 | #include <asm/types.h> | 20 | #include <linux/types.h> |
21 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
22 | 22 | ||
23 | #ifdef __KERNEL__ | 23 | #ifdef __KERNEL__ |
diff --git a/include/linux/if_strip.h b/include/linux/if_strip.h index fb5c5c98442f..6526a6235832 100644 --- a/include/linux/if_strip.h +++ b/include/linux/if_strip.h | |||
@@ -18,6 +18,8 @@ | |||
18 | #ifndef __LINUX_STRIP_H | 18 | #ifndef __LINUX_STRIP_H |
19 | #define __LINUX_STRIP_H | 19 | #define __LINUX_STRIP_H |
20 | 20 | ||
21 | #include <linux/types.h> | ||
22 | |||
21 | typedef struct { | 23 | typedef struct { |
22 | __u8 c[6]; | 24 | __u8 c[6]; |
23 | } MetricomAddress; | 25 | } MetricomAddress; |
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h index 5bcec8b2c5e2..fc23aeb0f201 100644 --- a/include/linux/if_tr.h +++ b/include/linux/if_tr.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #ifndef _LINUX_IF_TR_H | 19 | #ifndef _LINUX_IF_TR_H |
20 | #define _LINUX_IF_TR_H | 20 | #define _LINUX_IF_TR_H |
21 | 21 | ||
22 | #include <linux/types.h> | ||
22 | #include <asm/byteorder.h> /* For __be16 */ | 23 | #include <asm/byteorder.h> /* For __be16 */ |
23 | 24 | ||
24 | /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble | 25 | /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble |
diff --git a/include/linux/igmp.h b/include/linux/igmp.h index f734a0ba0698..92fbd8cbd68f 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #ifndef _LINUX_IGMP_H | 16 | #ifndef _LINUX_IGMP_H |
17 | #define _LINUX_IGMP_H | 17 | #define _LINUX_IGMP_H |
18 | 18 | ||
19 | #include <linux/types.h> | ||
19 | #include <asm/byteorder.h> | 20 | #include <asm/byteorder.h> |
20 | 21 | ||
21 | /* | 22 | /* |
diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h index 6e8bc548635a..bc8c49022084 100644 --- a/include/linux/inet_diag.h +++ b/include/linux/inet_diag.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _INET_DIAG_H_ | 1 | #ifndef _INET_DIAG_H_ |
2 | #define _INET_DIAG_H_ 1 | 2 | #define _INET_DIAG_H_ 1 |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* Just some random number */ | 6 | /* Just some random number */ |
5 | #define TCPDIAG_GETSOCK 18 | 7 | #define TCPDIAG_GETSOCK 18 |
6 | #define DCCPDIAG_GETSOCK 19 | 8 | #define DCCPDIAG_GETSOCK 19 |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 2f3c2d4ef73b..ea0ea1a4c36f 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -48,6 +48,12 @@ extern struct fs_struct init_fs; | |||
48 | .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ | 48 | .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ |
49 | .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ | 49 | .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ |
50 | .rlim = INIT_RLIMITS, \ | 50 | .rlim = INIT_RLIMITS, \ |
51 | .cputime = { .totals = { \ | ||
52 | .utime = cputime_zero, \ | ||
53 | .stime = cputime_zero, \ | ||
54 | .sum_exec_runtime = 0, \ | ||
55 | .lock = __SPIN_LOCK_UNLOCKED(sig.cputime.totals.lock), \ | ||
56 | }, }, \ | ||
51 | } | 57 | } |
52 | 58 | ||
53 | extern struct nsproxy init_nsproxy; | 59 | extern struct nsproxy init_nsproxy; |
diff --git a/include/linux/input.h b/include/linux/input.h index 9a6355f74db2..1249a0c20a38 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <sys/time.h> | 16 | #include <sys/time.h> |
17 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> |
18 | #include <sys/types.h> | 18 | #include <sys/types.h> |
19 | #include <asm/types.h> | 19 | #include <linux/types.h> |
20 | #endif | 20 | #endif |
21 | 21 | ||
22 | /* | 22 | /* |
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index f6bb2ca8e3ba..32e4b2f72294 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -143,7 +143,8 @@ static inline unsigned long resource_type(struct resource *res) | |||
143 | 143 | ||
144 | extern struct resource * __request_region(struct resource *, | 144 | extern struct resource * __request_region(struct resource *, |
145 | resource_size_t start, | 145 | resource_size_t start, |
146 | resource_size_t n, const char *name, int relaxed); | 146 | resource_size_t n, |
147 | const char *name, int flags); | ||
147 | 148 | ||
148 | /* Compatibility cruft */ | 149 | /* Compatibility cruft */ |
149 | #define release_region(start,n) __release_region(&ioport_resource, (start), (n)) | 150 | #define release_region(start,n) __release_region(&ioport_resource, (start), (n)) |
diff --git a/include/linux/ip6_tunnel.h b/include/linux/ip6_tunnel.h index 1e7cc4af40de..acb9ad684d63 100644 --- a/include/linux/ip6_tunnel.h +++ b/include/linux/ip6_tunnel.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _IP6_TUNNEL_H | 1 | #ifndef _IP6_TUNNEL_H |
2 | #define _IP6_TUNNEL_H | 2 | #define _IP6_TUNNEL_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | #define IPV6_TLV_TNL_ENCAP_LIMIT 4 | 6 | #define IPV6_TLV_TNL_ENCAP_LIMIT 4 |
5 | #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4 | 7 | #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4 |
6 | 8 | ||
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 0b816cae533e..476d9464ac82 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _IPV6_H | 1 | #ifndef _IPV6_H |
2 | #define _IPV6_H | 2 | #define _IPV6_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/in6.h> | 5 | #include <linux/in6.h> |
5 | #include <asm/byteorder.h> | 6 | #include <asm/byteorder.h> |
6 | 7 | ||
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h index b323ff577967..1e7d8af2defe 100644 --- a/include/linux/ipv6_route.h +++ b/include/linux/ipv6_route.h | |||
@@ -13,6 +13,8 @@ | |||
13 | #ifndef _LINUX_IPV6_ROUTE_H | 13 | #ifndef _LINUX_IPV6_ROUTE_H |
14 | #define _LINUX_IPV6_ROUTE_H | 14 | #define _LINUX_IPV6_ROUTE_H |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
16 | #define RTF_DEFAULT 0x00010000 /* default - learned via ND */ | 18 | #define RTF_DEFAULT 0x00010000 /* default - learned via ND */ |
17 | #define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed) | 19 | #define RTF_ALLONLINK 0x00020000 /* (deprecated and will be removed) |
18 | fallback, no routers on link */ | 20 | fallback, no routers on link */ |
diff --git a/include/linux/ipx.h b/include/linux/ipx.h index eb19b4ea84f4..aabb1d294025 100644 --- a/include/linux/ipx.h +++ b/include/linux/ipx.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #ifndef _IPX_H_ | 1 | #ifndef _IPX_H_ |
2 | #define _IPX_H_ | 2 | #define _IPX_H_ |
3 | #include <linux/types.h> | ||
3 | #include <linux/sockios.h> | 4 | #include <linux/sockios.h> |
4 | #include <linux/socket.h> | 5 | #include <linux/socket.h> |
5 | #define IPX_NODE_LEN 6 | 6 | #define IPX_NODE_LEN 6 |
diff --git a/include/linux/irda.h b/include/linux/irda.h index 28f88ecba344..00bdad0e8515 100644 --- a/include/linux/irda.h +++ b/include/linux/irda.h | |||
@@ -25,6 +25,8 @@ | |||
25 | #ifndef KERNEL_IRDA_H | 25 | #ifndef KERNEL_IRDA_H |
26 | #define KERNEL_IRDA_H | 26 | #define KERNEL_IRDA_H |
27 | 27 | ||
28 | #include <linux/types.h> | ||
29 | |||
28 | /* Please do *not* add any #include in this file, this file is | 30 | /* Please do *not* add any #include in this file, this file is |
29 | * included as-is in user space. | 31 | * included as-is in user space. |
30 | * Please fix the calling file to properly included needed files before | 32 | * Please fix the calling file to properly included needed files before |
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 6384b19efe64..64246dce5663 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h | |||
@@ -614,6 +614,8 @@ struct transaction_s | |||
614 | * @j_wbufsize: maximum number of buffer_heads allowed in j_wbuf, the | 614 | * @j_wbufsize: maximum number of buffer_heads allowed in j_wbuf, the |
615 | * number that will fit in j_blocksize | 615 | * number that will fit in j_blocksize |
616 | * @j_last_sync_writer: most recent pid which did a synchronous write | 616 | * @j_last_sync_writer: most recent pid which did a synchronous write |
617 | * @j_average_commit_time: the average amount of time in nanoseconds it | ||
618 | * takes to commit a transaction to the disk. | ||
617 | * @j_private: An opaque pointer to fs-private information. | 619 | * @j_private: An opaque pointer to fs-private information. |
618 | */ | 620 | */ |
619 | 621 | ||
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index b45109c61fba..b28b37eb11c6 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
@@ -308,7 +308,8 @@ void buffer_assertion_failure(struct buffer_head *bh); | |||
308 | int val = (expr); \ | 308 | int val = (expr); \ |
309 | if (!val) { \ | 309 | if (!val) { \ |
310 | printk(KERN_ERR \ | 310 | printk(KERN_ERR \ |
311 | "EXT3-fs unexpected failure: %s;\n",# expr); \ | 311 | "JBD2 unexpected failure: %s: %s;\n", \ |
312 | __func__, #expr); \ | ||
312 | printk(KERN_ERR why "\n"); \ | 313 | printk(KERN_ERR why "\n"); \ |
313 | } \ | 314 | } \ |
314 | val; \ | 315 | val; \ |
diff --git a/include/linux/joystick.h b/include/linux/joystick.h index b5e051295a67..9e20c29c1e14 100644 --- a/include/linux/joystick.h +++ b/include/linux/joystick.h | |||
@@ -27,7 +27,7 @@ | |||
27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic | 27 | * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <asm/types.h> | 30 | #include <linux/types.h> |
31 | #include <linux/input.h> | 31 | #include <linux/input.h> |
32 | 32 | ||
33 | /* | 33 | /* |
diff --git a/include/linux/klist.h b/include/linux/klist.h index d5a27af9dba5..e91a4e59b771 100644 --- a/include/linux/klist.h +++ b/include/linux/klist.h | |||
@@ -22,7 +22,7 @@ struct klist { | |||
22 | struct list_head k_list; | 22 | struct list_head k_list; |
23 | void (*get)(struct klist_node *); | 23 | void (*get)(struct klist_node *); |
24 | void (*put)(struct klist_node *); | 24 | void (*put)(struct klist_node *); |
25 | }; | 25 | } __attribute__ ((aligned (4))); |
26 | 26 | ||
27 | #define KLIST_INIT(_name, _get, _put) \ | 27 | #define KLIST_INIT(_name, _get, _put) \ |
28 | { .k_lock = __SPIN_LOCK_UNLOCKED(_name.k_lock), \ | 28 | { .k_lock = __SPIN_LOCK_UNLOCKED(_name.k_lock), \ |
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index d6ea19e314bb..32851eef48f0 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h | |||
@@ -49,6 +49,13 @@ | |||
49 | 49 | ||
50 | /* Attach to insert probes on any functions which should be ignored*/ | 50 | /* Attach to insert probes on any functions which should be ignored*/ |
51 | #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace | 51 | #define __kprobes __attribute__((__section__(".kprobes.text"))) notrace |
52 | #else /* CONFIG_KPROBES */ | ||
53 | typedef int kprobe_opcode_t; | ||
54 | struct arch_specific_insn { | ||
55 | int dummy; | ||
56 | }; | ||
57 | #define __kprobes notrace | ||
58 | #endif /* CONFIG_KPROBES */ | ||
52 | 59 | ||
53 | struct kprobe; | 60 | struct kprobe; |
54 | struct pt_regs; | 61 | struct pt_regs; |
@@ -131,23 +138,6 @@ struct jprobe { | |||
131 | /* For backward compatibility with old code using JPROBE_ENTRY() */ | 138 | /* For backward compatibility with old code using JPROBE_ENTRY() */ |
132 | #define JPROBE_ENTRY(handler) (handler) | 139 | #define JPROBE_ENTRY(handler) (handler) |
133 | 140 | ||
134 | DECLARE_PER_CPU(struct kprobe *, current_kprobe); | ||
135 | DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); | ||
136 | |||
137 | #ifdef CONFIG_KRETPROBES | ||
138 | extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, | ||
139 | struct pt_regs *regs); | ||
140 | extern int arch_trampoline_kprobe(struct kprobe *p); | ||
141 | #else /* CONFIG_KRETPROBES */ | ||
142 | static inline void arch_prepare_kretprobe(struct kretprobe *rp, | ||
143 | struct pt_regs *regs) | ||
144 | { | ||
145 | } | ||
146 | static inline int arch_trampoline_kprobe(struct kprobe *p) | ||
147 | { | ||
148 | return 0; | ||
149 | } | ||
150 | #endif /* CONFIG_KRETPROBES */ | ||
151 | /* | 141 | /* |
152 | * Function-return probe - | 142 | * Function-return probe - |
153 | * Note: | 143 | * Note: |
@@ -188,6 +178,25 @@ struct kprobe_blackpoint { | |||
188 | unsigned long range; | 178 | unsigned long range; |
189 | }; | 179 | }; |
190 | 180 | ||
181 | #ifdef CONFIG_KPROBES | ||
182 | DECLARE_PER_CPU(struct kprobe *, current_kprobe); | ||
183 | DECLARE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); | ||
184 | |||
185 | #ifdef CONFIG_KRETPROBES | ||
186 | extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, | ||
187 | struct pt_regs *regs); | ||
188 | extern int arch_trampoline_kprobe(struct kprobe *p); | ||
189 | #else /* CONFIG_KRETPROBES */ | ||
190 | static inline void arch_prepare_kretprobe(struct kretprobe *rp, | ||
191 | struct pt_regs *regs) | ||
192 | { | ||
193 | } | ||
194 | static inline int arch_trampoline_kprobe(struct kprobe *p) | ||
195 | { | ||
196 | return 0; | ||
197 | } | ||
198 | #endif /* CONFIG_KRETPROBES */ | ||
199 | |||
191 | extern struct kretprobe_blackpoint kretprobe_blacklist[]; | 200 | extern struct kretprobe_blackpoint kretprobe_blacklist[]; |
192 | 201 | ||
193 | static inline void kretprobe_assert(struct kretprobe_instance *ri, | 202 | static inline void kretprobe_assert(struct kretprobe_instance *ri, |
@@ -264,10 +273,6 @@ void recycle_rp_inst(struct kretprobe_instance *ri, struct hlist_head *head); | |||
264 | 273 | ||
265 | #else /* CONFIG_KPROBES */ | 274 | #else /* CONFIG_KPROBES */ |
266 | 275 | ||
267 | #define __kprobes notrace | ||
268 | struct jprobe; | ||
269 | struct kretprobe; | ||
270 | |||
271 | static inline struct kprobe *get_kprobe(void *addr) | 276 | static inline struct kprobe *get_kprobe(void *addr) |
272 | { | 277 | { |
273 | return NULL; | 278 | return NULL; |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 35525ac63337..5715f1907601 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * Note: you must update KVM_API_VERSION if you change this interface. | 7 | * Note: you must update KVM_API_VERSION if you change this interface. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <asm/types.h> | 10 | #include <linux/types.h> |
11 | #include <linux/compiler.h> | 11 | #include <linux/compiler.h> |
12 | #include <linux/ioctl.h> | 12 | #include <linux/ioctl.h> |
13 | #include <asm/kvm.h> | 13 | #include <asm/kvm.h> |
diff --git a/include/linux/libata.h b/include/linux/libata.h index b6b8a7f3ec66..bca3ba25f52a 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -187,6 +187,8 @@ enum { | |||
187 | ATA_FLAG_PIO_POLLING = (1 << 9), /* use polling PIO if LLD | 187 | ATA_FLAG_PIO_POLLING = (1 << 9), /* use polling PIO if LLD |
188 | * doesn't handle PIO interrupts */ | 188 | * doesn't handle PIO interrupts */ |
189 | ATA_FLAG_NCQ = (1 << 10), /* host supports NCQ */ | 189 | ATA_FLAG_NCQ = (1 << 10), /* host supports NCQ */ |
190 | ATA_FLAG_NO_POWEROFF_SPINDOWN = (1 << 11), /* don't spindown before poweroff */ | ||
191 | ATA_FLAG_NO_HIBERNATE_SPINDOWN = (1 << 12), /* don't spindown before hibernation */ | ||
190 | ATA_FLAG_DEBUGMSG = (1 << 13), | 192 | ATA_FLAG_DEBUGMSG = (1 << 13), |
191 | ATA_FLAG_IGN_SIMPLEX = (1 << 15), /* ignore SIMPLEX */ | 193 | ATA_FLAG_IGN_SIMPLEX = (1 << 15), /* ignore SIMPLEX */ |
192 | ATA_FLAG_NO_IORDY = (1 << 16), /* controller lacks iordy */ | 194 | ATA_FLAG_NO_IORDY = (1 << 16), /* controller lacks iordy */ |
@@ -401,12 +403,14 @@ enum { | |||
401 | ATA_TIMING_CYC8B, | 403 | ATA_TIMING_CYC8B, |
402 | ATA_TIMING_ACTIVE = (1 << 4), | 404 | ATA_TIMING_ACTIVE = (1 << 4), |
403 | ATA_TIMING_RECOVER = (1 << 5), | 405 | ATA_TIMING_RECOVER = (1 << 5), |
404 | ATA_TIMING_CYCLE = (1 << 6), | 406 | ATA_TIMING_DMACK_HOLD = (1 << 6), |
405 | ATA_TIMING_UDMA = (1 << 7), | 407 | ATA_TIMING_CYCLE = (1 << 7), |
408 | ATA_TIMING_UDMA = (1 << 8), | ||
406 | ATA_TIMING_ALL = ATA_TIMING_SETUP | ATA_TIMING_ACT8B | | 409 | ATA_TIMING_ALL = ATA_TIMING_SETUP | ATA_TIMING_ACT8B | |
407 | ATA_TIMING_REC8B | ATA_TIMING_CYC8B | | 410 | ATA_TIMING_REC8B | ATA_TIMING_CYC8B | |
408 | ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER | | 411 | ATA_TIMING_ACTIVE | ATA_TIMING_RECOVER | |
409 | ATA_TIMING_CYCLE | ATA_TIMING_UDMA, | 412 | ATA_TIMING_DMACK_HOLD | ATA_TIMING_CYCLE | |
413 | ATA_TIMING_UDMA, | ||
410 | }; | 414 | }; |
411 | 415 | ||
412 | enum ata_xfer_mask { | 416 | enum ata_xfer_mask { |
@@ -866,6 +870,7 @@ struct ata_timing { | |||
866 | unsigned short cyc8b; /* t0 for 8-bit I/O */ | 870 | unsigned short cyc8b; /* t0 for 8-bit I/O */ |
867 | unsigned short active; /* t2 or tD */ | 871 | unsigned short active; /* t2 or tD */ |
868 | unsigned short recover; /* t2i or tK */ | 872 | unsigned short recover; /* t2i or tK */ |
873 | unsigned short dmack_hold; /* tj */ | ||
869 | unsigned short cycle; /* t0 */ | 874 | unsigned short cycle; /* t0 */ |
870 | unsigned short udma; /* t2CYCTYP/2 */ | 875 | unsigned short udma; /* t2CYCTYP/2 */ |
871 | }; | 876 | }; |
@@ -927,6 +932,8 @@ extern void ata_host_init(struct ata_host *, struct device *, | |||
927 | extern int ata_scsi_detect(struct scsi_host_template *sht); | 932 | extern int ata_scsi_detect(struct scsi_host_template *sht); |
928 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); | 933 | extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); |
929 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); | 934 | extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); |
935 | extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev, | ||
936 | int cmd, void __user *arg); | ||
930 | extern void ata_sas_port_destroy(struct ata_port *); | 937 | extern void ata_sas_port_destroy(struct ata_port *); |
931 | extern struct ata_port *ata_sas_port_alloc(struct ata_host *, | 938 | extern struct ata_port *ata_sas_port_alloc(struct ata_host *, |
932 | struct ata_port_info *, struct Scsi_Host *); | 939 | struct ata_port_info *, struct Scsi_Host *); |
diff --git a/include/linux/loop.h b/include/linux/loop.h index 46169a7b559b..6ffd6db5bb0d 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
@@ -80,7 +80,7 @@ enum { | |||
80 | }; | 80 | }; |
81 | 81 | ||
82 | #include <asm/posix_types.h> /* for __kernel_old_dev_t */ | 82 | #include <asm/posix_types.h> /* for __kernel_old_dev_t */ |
83 | #include <asm/types.h> /* for __u64 */ | 83 | #include <linux/types.h> /* for __u64 */ |
84 | 84 | ||
85 | /* Backwards compatibility version */ | 85 | /* Backwards compatibility version */ |
86 | struct loop_info { | 86 | struct loop_info { |
diff --git a/include/linux/magic.h b/include/linux/magic.h index 439f6f3cb0c4..0b4df7eba852 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h | |||
@@ -10,11 +10,13 @@ | |||
10 | #define SYSFS_MAGIC 0x62656572 | 10 | #define SYSFS_MAGIC 0x62656572 |
11 | #define SECURITYFS_MAGIC 0x73636673 | 11 | #define SECURITYFS_MAGIC 0x73636673 |
12 | #define TMPFS_MAGIC 0x01021994 | 12 | #define TMPFS_MAGIC 0x01021994 |
13 | #define SQUASHFS_MAGIC 0x73717368 | ||
13 | #define EFS_SUPER_MAGIC 0x414A53 | 14 | #define EFS_SUPER_MAGIC 0x414A53 |
14 | #define EXT2_SUPER_MAGIC 0xEF53 | 15 | #define EXT2_SUPER_MAGIC 0xEF53 |
15 | #define EXT3_SUPER_MAGIC 0xEF53 | 16 | #define EXT3_SUPER_MAGIC 0xEF53 |
16 | #define XENFS_SUPER_MAGIC 0xabba1974 | 17 | #define XENFS_SUPER_MAGIC 0xabba1974 |
17 | #define EXT4_SUPER_MAGIC 0xEF53 | 18 | #define EXT4_SUPER_MAGIC 0xEF53 |
19 | #define BTRFS_SUPER_MAGIC 0x9123683E | ||
18 | #define HPFS_SUPER_MAGIC 0xf995e849 | 20 | #define HPFS_SUPER_MAGIC 0xf995e849 |
19 | #define ISOFS_SUPER_MAGIC 0x9660 | 21 | #define ISOFS_SUPER_MAGIC 0x9660 |
20 | #define JFFS2_SUPER_MAGIC 0x72b6 | 22 | #define JFFS2_SUPER_MAGIC 0x72b6 |
diff --git a/include/linux/matroxfb.h b/include/linux/matroxfb.h index ae5b09493062..404f678e734b 100644 --- a/include/linux/matroxfb.h +++ b/include/linux/matroxfb.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __LINUX_MATROXFB_H__ | 2 | #define __LINUX_MATROXFB_H__ |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm/ioctl.h> |
5 | #include <asm/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/videodev2.h> | 6 | #include <linux/videodev2.h> |
7 | 7 | ||
8 | struct matroxioc_output_mode { | 8 | struct matroxioc_output_mode { |
diff --git a/include/linux/minix_fs.h b/include/linux/minix_fs.h index 0e39745f5111..13fe09e0576a 100644 --- a/include/linux/minix_fs.h +++ b/include/linux/minix_fs.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _LINUX_MINIX_FS_H | 1 | #ifndef _LINUX_MINIX_FS_H |
2 | #define _LINUX_MINIX_FS_H | 2 | #define _LINUX_MINIX_FS_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/magic.h> | 5 | #include <linux/magic.h> |
5 | 6 | ||
6 | /* | 7 | /* |
diff --git a/include/linux/mm.h b/include/linux/mm.h index b91a73fd1bcc..e8ddc98b8405 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -260,7 +260,6 @@ static inline int put_page_testzero(struct page *page) | |||
260 | */ | 260 | */ |
261 | static inline int get_page_unless_zero(struct page *page) | 261 | static inline int get_page_unless_zero(struct page *page) |
262 | { | 262 | { |
263 | VM_BUG_ON(PageTail(page)); | ||
264 | return atomic_inc_not_zero(&page->_count); | 263 | return atomic_inc_not_zero(&page->_count); |
265 | } | 264 | } |
266 | 265 | ||
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 97b91d1abb43..fde86671f48f 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -443,6 +443,13 @@ struct dmi_system_id { | |||
443 | struct dmi_strmatch matches[4]; | 443 | struct dmi_strmatch matches[4]; |
444 | void *driver_data; | 444 | void *driver_data; |
445 | }; | 445 | }; |
446 | /* | ||
447 | * struct dmi_device_id appears during expansion of | ||
448 | * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it | ||
449 | * but this is enough for gcc 3.4.6 to error out: | ||
450 | * error: storage size of '__mod_dmi_device_table' isn't known | ||
451 | */ | ||
452 | #define dmi_device_id dmi_system_id | ||
446 | #endif | 453 | #endif |
447 | 454 | ||
448 | #define DMI_MATCH(a, b) { a, b } | 455 | #define DMI_MATCH(a, b) { a, b } |
diff --git a/include/linux/module.h b/include/linux/module.h index 4f7ea12463d3..f3b8329eb5b8 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -219,11 +219,6 @@ void *__symbol_get_gpl(const char *symbol); | |||
219 | 219 | ||
220 | #endif | 220 | #endif |
221 | 221 | ||
222 | struct module_ref | ||
223 | { | ||
224 | local_t count; | ||
225 | } ____cacheline_aligned; | ||
226 | |||
227 | enum module_state | 222 | enum module_state |
228 | { | 223 | { |
229 | MODULE_STATE_LIVE, | 224 | MODULE_STATE_LIVE, |
@@ -344,8 +339,11 @@ struct module | |||
344 | /* Destruction function. */ | 339 | /* Destruction function. */ |
345 | void (*exit)(void); | 340 | void (*exit)(void); |
346 | 341 | ||
347 | /* Reference counts */ | 342 | #ifdef CONFIG_SMP |
348 | struct module_ref ref[NR_CPUS]; | 343 | char *refptr; |
344 | #else | ||
345 | local_t ref; | ||
346 | #endif | ||
349 | #endif | 347 | #endif |
350 | }; | 348 | }; |
351 | #ifndef MODULE_ARCH_INIT | 349 | #ifndef MODULE_ARCH_INIT |
@@ -395,13 +393,22 @@ void __symbol_put(const char *symbol); | |||
395 | #define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x) | 393 | #define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x) |
396 | void symbol_put_addr(void *addr); | 394 | void symbol_put_addr(void *addr); |
397 | 395 | ||
396 | static inline local_t *__module_ref_addr(struct module *mod, int cpu) | ||
397 | { | ||
398 | #ifdef CONFIG_SMP | ||
399 | return (local_t *) (mod->refptr + per_cpu_offset(cpu)); | ||
400 | #else | ||
401 | return &mod->ref; | ||
402 | #endif | ||
403 | } | ||
404 | |||
398 | /* Sometimes we know we already have a refcount, and it's easier not | 405 | /* Sometimes we know we already have a refcount, and it's easier not |
399 | to handle the error case (which only happens with rmmod --wait). */ | 406 | to handle the error case (which only happens with rmmod --wait). */ |
400 | static inline void __module_get(struct module *module) | 407 | static inline void __module_get(struct module *module) |
401 | { | 408 | { |
402 | if (module) { | 409 | if (module) { |
403 | BUG_ON(module_refcount(module) == 0); | 410 | BUG_ON(module_refcount(module) == 0); |
404 | local_inc(&module->ref[get_cpu()].count); | 411 | local_inc(__module_ref_addr(module, get_cpu())); |
405 | put_cpu(); | 412 | put_cpu(); |
406 | } | 413 | } |
407 | } | 414 | } |
@@ -413,7 +420,7 @@ static inline int try_module_get(struct module *module) | |||
413 | if (module) { | 420 | if (module) { |
414 | unsigned int cpu = get_cpu(); | 421 | unsigned int cpu = get_cpu(); |
415 | if (likely(module_is_live(module))) | 422 | if (likely(module_is_live(module))) |
416 | local_inc(&module->ref[cpu].count); | 423 | local_inc(__module_ref_addr(module, cpu)); |
417 | else | 424 | else |
418 | ret = 0; | 425 | ret = 0; |
419 | put_cpu(); | 426 | put_cpu(); |
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index e0a9b207920d..ce38f1caa5e1 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _LINUX_MSDOS_FS_H | 1 | #ifndef _LINUX_MSDOS_FS_H |
2 | #define _LINUX_MSDOS_FS_H | 2 | #define _LINUX_MSDOS_FS_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/magic.h> | 5 | #include <linux/magic.h> |
5 | #include <asm/byteorder.h> | 6 | #include <asm/byteorder.h> |
6 | 7 | ||
diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index bd3bbf668cdb..8730d5dae1bc 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_NEIGHBOUR_H | 1 | #ifndef __LINUX_NEIGHBOUR_H |
2 | #define __LINUX_NEIGHBOUR_H | 2 | #define __LINUX_NEIGHBOUR_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
5 | 6 | ||
6 | struct ndmsg | 7 | struct ndmsg |
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f24556813375..ec54785d34f9 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -467,7 +467,7 @@ struct netdev_queue { | |||
467 | * This function is called when network device transistions to the down | 467 | * This function is called when network device transistions to the down |
468 | * state. | 468 | * state. |
469 | * | 469 | * |
470 | * int (*ndo_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev); | 470 | * int (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev); |
471 | * Called when a packet needs to be transmitted. | 471 | * Called when a packet needs to be transmitted. |
472 | * Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED, | 472 | * Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED, |
473 | * Required can not be NULL. | 473 | * Required can not be NULL. |
@@ -795,6 +795,7 @@ struct net_device | |||
795 | NETREG_UNREGISTERING, /* called unregister_netdevice */ | 795 | NETREG_UNREGISTERING, /* called unregister_netdevice */ |
796 | NETREG_UNREGISTERED, /* completed unregister todo */ | 796 | NETREG_UNREGISTERED, /* completed unregister todo */ |
797 | NETREG_RELEASED, /* called free_netdev */ | 797 | NETREG_RELEASED, /* called free_netdev */ |
798 | NETREG_DUMMY, /* dummy device for NAPI poll */ | ||
798 | } reg_state; | 799 | } reg_state; |
799 | 800 | ||
800 | /* Called from unregister, can be used to call free_netdev */ | 801 | /* Called from unregister, can be used to call free_netdev */ |
@@ -1077,6 +1078,8 @@ extern void free_netdev(struct net_device *dev); | |||
1077 | extern void synchronize_net(void); | 1078 | extern void synchronize_net(void); |
1078 | extern int register_netdevice_notifier(struct notifier_block *nb); | 1079 | extern int register_netdevice_notifier(struct notifier_block *nb); |
1079 | extern int unregister_netdevice_notifier(struct notifier_block *nb); | 1080 | extern int unregister_netdevice_notifier(struct notifier_block *nb); |
1081 | extern int init_dummy_netdev(struct net_device *dev); | ||
1082 | |||
1080 | extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); | 1083 | extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev); |
1081 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); | 1084 | extern struct net_device *dev_get_by_index(struct net *net, int ifindex); |
1082 | extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); | 1085 | extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); |
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index e52ce475d19f..c7ee8744d26b 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
@@ -270,6 +270,7 @@ struct xt_match | |||
270 | struct list_head list; | 270 | struct list_head list; |
271 | 271 | ||
272 | const char name[XT_FUNCTION_MAXNAMELEN-1]; | 272 | const char name[XT_FUNCTION_MAXNAMELEN-1]; |
273 | u_int8_t revision; | ||
273 | 274 | ||
274 | /* Return true or false: return FALSE and set *hotdrop = 1 to | 275 | /* Return true or false: return FALSE and set *hotdrop = 1 to |
275 | force immediate packet drop. */ | 276 | force immediate packet drop. */ |
@@ -302,7 +303,6 @@ struct xt_match | |||
302 | unsigned short proto; | 303 | unsigned short proto; |
303 | 304 | ||
304 | unsigned short family; | 305 | unsigned short family; |
305 | u_int8_t revision; | ||
306 | }; | 306 | }; |
307 | 307 | ||
308 | /* Registration hooks for targets. */ | 308 | /* Registration hooks for targets. */ |
diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h index f3fd83e46bab..8f5345275393 100644 --- a/include/linux/netfilter/xt_conntrack.h +++ b/include/linux/netfilter/xt_conntrack.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #ifndef _XT_CONNTRACK_H | 5 | #ifndef _XT_CONNTRACK_H |
6 | #define _XT_CONNTRACK_H | 6 | #define _XT_CONNTRACK_H |
7 | 7 | ||
8 | #include <linux/types.h> | ||
8 | #include <linux/netfilter/nf_conntrack_tuple_common.h> | 9 | #include <linux/netfilter/nf_conntrack_tuple_common.h> |
9 | 10 | ||
10 | #define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) | 11 | #define XT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) |
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h index 15a9f3b7289a..91a1c24e0cbf 100644 --- a/include/linux/nfs_idmap.h +++ b/include/linux/nfs_idmap.h | |||
@@ -37,6 +37,8 @@ | |||
37 | #ifndef NFS_IDMAP_H | 37 | #ifndef NFS_IDMAP_H |
38 | #define NFS_IDMAP_H | 38 | #define NFS_IDMAP_H |
39 | 39 | ||
40 | #include <linux/types.h> | ||
41 | |||
40 | /* XXX from bits/utmp.h */ | 42 | /* XXX from bits/utmp.h */ |
41 | #define IDMAP_NAMESZ 128 | 43 | #define IDMAP_NAMESZ 128 |
42 | 44 | ||
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 5431512b2757..bcd0201589f8 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
@@ -10,9 +10,8 @@ | |||
10 | #ifndef NFSD_EXPORT_H | 10 | #ifndef NFSD_EXPORT_H |
11 | #define NFSD_EXPORT_H | 11 | #define NFSD_EXPORT_H |
12 | 12 | ||
13 | #include <asm/types.h> | ||
14 | #ifdef __KERNEL__ | ||
15 | # include <linux/types.h> | 13 | # include <linux/types.h> |
14 | #ifdef __KERNEL__ | ||
16 | # include <linux/in.h> | 15 | # include <linux/in.h> |
17 | #endif | 16 | #endif |
18 | 17 | ||
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index b2e093870bc6..fa317f6c154b 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
@@ -14,9 +14,8 @@ | |||
14 | #ifndef _LINUX_NFSD_FH_H | 14 | #ifndef _LINUX_NFSD_FH_H |
15 | #define _LINUX_NFSD_FH_H | 15 | #define _LINUX_NFSD_FH_H |
16 | 16 | ||
17 | #include <asm/types.h> | ||
18 | #ifdef __KERNEL__ | ||
19 | # include <linux/types.h> | 17 | # include <linux/types.h> |
18 | #ifdef __KERNEL__ | ||
20 | # include <linux/string.h> | 19 | # include <linux/string.h> |
21 | # include <linux/fs.h> | 20 | # include <linux/fs.h> |
22 | #endif | 21 | #endif |
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h index 4e439765b705..7a3b565b898f 100644 --- a/include/linux/nfsd/syscall.h +++ b/include/linux/nfsd/syscall.h | |||
@@ -9,9 +9,8 @@ | |||
9 | #ifndef NFSD_SYSCALL_H | 9 | #ifndef NFSD_SYSCALL_H |
10 | #define NFSD_SYSCALL_H | 10 | #define NFSD_SYSCALL_H |
11 | 11 | ||
12 | #include <asm/types.h> | ||
13 | #ifdef __KERNEL__ | ||
14 | # include <linux/types.h> | 12 | # include <linux/types.h> |
13 | #ifdef __KERNEL__ | ||
15 | # include <linux/in.h> | 14 | # include <linux/in.h> |
16 | #endif | 15 | #endif |
17 | #include <linux/posix_types.h> | 16 | #include <linux/posix_types.h> |
diff --git a/include/linux/nubus.h b/include/linux/nubus.h index c4355076d1a5..7382af374731 100644 --- a/include/linux/nubus.h +++ b/include/linux/nubus.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #ifndef LINUX_NUBUS_H | 12 | #ifndef LINUX_NUBUS_H |
13 | #define LINUX_NUBUS_H | 13 | #define LINUX_NUBUS_H |
14 | 14 | ||
15 | #include <linux/types.h> | ||
15 | #ifdef __KERNEL__ | 16 | #ifdef __KERNEL__ |
16 | #include <asm/nubus.h> | 17 | #include <asm/nubus.h> |
17 | #endif | 18 | #endif |
diff --git a/include/linux/of_i2c.h b/include/linux/of_i2c.h index bd2a870ec296..34974b5a76f7 100644 --- a/include/linux/of_i2c.h +++ b/include/linux/of_i2c.h | |||
@@ -17,4 +17,7 @@ | |||
17 | void of_register_i2c_devices(struct i2c_adapter *adap, | 17 | void of_register_i2c_devices(struct i2c_adapter *adap, |
18 | struct device_node *adap_node); | 18 | struct device_node *adap_node); |
19 | 19 | ||
20 | /* must call put_device() when done with returned i2c_client device */ | ||
21 | struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); | ||
22 | |||
20 | #endif /* __LINUX_OF_I2C_H */ | 23 | #endif /* __LINUX_OF_I2C_H */ |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 80f8b8b65fde..48890cf3f96e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -117,6 +117,10 @@ typedef int __bitwise pci_power_t; | |||
117 | #define PCI_UNKNOWN ((pci_power_t __force) 5) | 117 | #define PCI_UNKNOWN ((pci_power_t __force) 5) |
118 | #define PCI_POWER_ERROR ((pci_power_t __force) -1) | 118 | #define PCI_POWER_ERROR ((pci_power_t __force) -1) |
119 | 119 | ||
120 | #define PCI_PM_D2_DELAY 200 | ||
121 | #define PCI_PM_D3_WAIT 10 | ||
122 | #define PCI_PM_BUS_WAIT 50 | ||
123 | |||
120 | /** The pci_channel state describes connectivity between the CPU and | 124 | /** The pci_channel state describes connectivity between the CPU and |
121 | * the pci device. If some PCI bus between here and the pci device | 125 | * the pci device. If some PCI bus between here and the pci device |
122 | * has crashed or locked up, this info is reflected here. | 126 | * has crashed or locked up, this info is reflected here. |
@@ -252,6 +256,7 @@ struct pci_dev { | |||
252 | unsigned int ari_enabled:1; /* ARI forwarding */ | 256 | unsigned int ari_enabled:1; /* ARI forwarding */ |
253 | unsigned int is_managed:1; | 257 | unsigned int is_managed:1; |
254 | unsigned int is_pcie:1; | 258 | unsigned int is_pcie:1; |
259 | unsigned int state_saved:1; | ||
255 | pci_dev_flags_t dev_flags; | 260 | pci_dev_flags_t dev_flags; |
256 | atomic_t enable_cnt; /* pci_enable_device has been called */ | 261 | atomic_t enable_cnt; /* pci_enable_device has been called */ |
257 | 262 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d543365518ab..febc10ed3858 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1357,6 +1357,7 @@ | |||
1357 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 | 1357 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 |
1358 | #define PCI_DEVICE_ID_VIA_8237 0x3227 | 1358 | #define PCI_DEVICE_ID_VIA_8237 0x3227 |
1359 | #define PCI_DEVICE_ID_VIA_8251 0x3287 | 1359 | #define PCI_DEVICE_ID_VIA_8251 0x3287 |
1360 | #define PCI_DEVICE_ID_VIA_8261 0x3402 | ||
1360 | #define PCI_DEVICE_ID_VIA_8237A 0x3337 | 1361 | #define PCI_DEVICE_ID_VIA_8237A 0x3337 |
1361 | #define PCI_DEVICE_ID_VIA_8237S 0x3372 | 1362 | #define PCI_DEVICE_ID_VIA_8237S 0x3372 |
1362 | #define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324 | 1363 | #define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324 |
@@ -1366,10 +1367,13 @@ | |||
1366 | #define PCI_DEVICE_ID_VIA_CX700 0x8324 | 1367 | #define PCI_DEVICE_ID_VIA_CX700 0x8324 |
1367 | #define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581 | 1368 | #define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581 |
1368 | #define PCI_DEVICE_ID_VIA_VX800 0x8353 | 1369 | #define PCI_DEVICE_ID_VIA_VX800 0x8353 |
1370 | #define PCI_DEVICE_ID_VIA_VX855 0x8409 | ||
1369 | #define PCI_DEVICE_ID_VIA_8371_1 0x8391 | 1371 | #define PCI_DEVICE_ID_VIA_8371_1 0x8391 |
1370 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 | 1372 | #define PCI_DEVICE_ID_VIA_82C598_1 0x8598 |
1371 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 | 1373 | #define PCI_DEVICE_ID_VIA_838X_1 0xB188 |
1372 | #define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198 | 1374 | #define PCI_DEVICE_ID_VIA_83_87XX_1 0xB198 |
1375 | #define PCI_DEVICE_ID_VIA_C409_IDE 0XC409 | ||
1376 | #define PCI_DEVICE_ID_VIA_ANON 0xFFFF | ||
1373 | 1377 | ||
1374 | #define PCI_VENDOR_ID_SIEMENS 0x110A | 1378 | #define PCI_VENDOR_ID_SIEMENS 0x110A |
1375 | #define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102 | 1379 | #define PCI_DEVICE_ID_SIEMENS_DSCC4 0x2102 |
@@ -2174,6 +2178,7 @@ | |||
2174 | #define PCI_DEVICE_ID_RDC_R6040 0x6040 | 2178 | #define PCI_DEVICE_ID_RDC_R6040 0x6040 |
2175 | #define PCI_DEVICE_ID_RDC_R6060 0x6060 | 2179 | #define PCI_DEVICE_ID_RDC_R6060 0x6060 |
2176 | #define PCI_DEVICE_ID_RDC_R6061 0x6061 | 2180 | #define PCI_DEVICE_ID_RDC_R6061 0x6061 |
2181 | #define PCI_DEVICE_ID_RDC_D1010 0x1010 | ||
2177 | 2182 | ||
2178 | #define PCI_VENDOR_ID_LENOVO 0x17aa | 2183 | #define PCI_VENDOR_ID_LENOVO 0x17aa |
2179 | 2184 | ||
diff --git a/include/linux/phantom.h b/include/linux/phantom.h index 02268c54c250..94dd6645c60a 100644 --- a/include/linux/phantom.h +++ b/include/linux/phantom.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #ifndef __PHANTOM_H | 10 | #ifndef __PHANTOM_H |
11 | #define __PHANTOM_H | 11 | #define __PHANTOM_H |
12 | 12 | ||
13 | #include <asm/types.h> | 13 | #include <linux/types.h> |
14 | 14 | ||
15 | /* PHN_(G/S)ET_REG param */ | 15 | /* PHN_(G/S)ET_REG param */ |
16 | struct phm_reg { | 16 | struct phm_reg { |
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index 4157faa857b6..ee5e3c9e2bca 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h | |||
@@ -23,6 +23,8 @@ | |||
23 | #ifndef LINUX_PHONET_H | 23 | #ifndef LINUX_PHONET_H |
24 | #define LINUX_PHONET_H | 24 | #define LINUX_PHONET_H |
25 | 25 | ||
26 | #include <linux/types.h> | ||
27 | |||
26 | /* Automatic protocol selection */ | 28 | /* Automatic protocol selection */ |
27 | #define PN_PROTO_TRANSPORT 0 | 29 | #define PN_PROTO_TRANSPORT 0 |
28 | /* Phonet datagram socket */ | 30 | /* Phonet datagram socket */ |
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index e6aa8482ad7a..3c842edff388 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_PKT_CLS_H | 1 | #ifndef __LINUX_PKT_CLS_H |
2 | #define __LINUX_PKT_CLS_H | 2 | #define __LINUX_PKT_CLS_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_sched.h> | 5 | #include <linux/pkt_sched.h> |
5 | 6 | ||
6 | /* I think i could have done better macros ; for now this is stolen from | 7 | /* I think i could have done better macros ; for now this is stolen from |
diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h index e3f133adba78..b2648e8e4987 100644 --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef __LINUX_PKT_SCHED_H | 1 | #ifndef __LINUX_PKT_SCHED_H |
2 | #define __LINUX_PKT_SCHED_H | 2 | #define __LINUX_PKT_SCHED_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | /* Logical priority bands not depending on specific packet scheduler. | 6 | /* Logical priority bands not depending on specific packet scheduler. |
5 | Every scheduler will map them to real traffic classes, if it has | 7 | Every scheduler will map them to real traffic classes, if it has |
6 | no more precise mechanism to classify packets. | 8 | no more precise mechanism to classify packets. |
diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 6e8adc77522c..1c866bda2018 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h | |||
@@ -25,6 +25,8 @@ | |||
25 | * OR MODIFICATIONS. | 25 | * OR MODIFICATIONS. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/types.h> | ||
29 | |||
28 | /* | 30 | /* |
29 | * ==FILEVERSION 20000114== | 31 | * ==FILEVERSION 20000114== |
30 | * | 32 | * |
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index 21b781a3350f..0b35b3a1be05 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h | |||
@@ -24,10 +24,8 @@ void sync_dquots(struct super_block *sb, int type); | |||
24 | 24 | ||
25 | int dquot_initialize(struct inode *inode, int type); | 25 | int dquot_initialize(struct inode *inode, int type); |
26 | int dquot_drop(struct inode *inode); | 26 | int dquot_drop(struct inode *inode); |
27 | int dquot_drop_locked(struct inode *inode); | ||
28 | struct dquot *dqget(struct super_block *sb, unsigned int id, int type); | 27 | struct dquot *dqget(struct super_block *sb, unsigned int id, int type); |
29 | void dqput(struct dquot *dquot); | 28 | void dqput(struct dquot *dquot); |
30 | int dquot_is_cached(struct super_block *sb, unsigned int id, int type); | ||
31 | int dquot_scan_active(struct super_block *sb, | 29 | int dquot_scan_active(struct super_block *sb, |
32 | int (*fn)(struct dquot *dquot, unsigned long priv), | 30 | int (*fn)(struct dquot *dquot, unsigned long priv), |
33 | unsigned long priv); | 31 | unsigned long priv); |
diff --git a/include/linux/radeonfb.h b/include/linux/radeonfb.h index 5bd8975ed78e..8c4bbdecc44f 100644 --- a/include/linux/radeonfb.h +++ b/include/linux/radeonfb.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __LINUX_RADEONFB_H__ | 2 | #define __LINUX_RADEONFB_H__ |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm/ioctl.h> |
5 | #include <asm/types.h> | 5 | #include <linux/types.h> |
6 | 6 | ||
7 | #define ATY_RADEON_LCD_ON 0x00000001 | 7 | #define ATY_RADEON_LCD_ON 0x00000001 |
8 | #define ATY_RADEON_CRT_ON 0x00000002 | 8 | #define ATY_RADEON_CRT_ON 0x00000002 |
diff --git a/include/linux/raid/md_p.h b/include/linux/raid/md_p.h index 9491026afe66..6ba830fa8538 100644 --- a/include/linux/raid/md_p.h +++ b/include/linux/raid/md_p.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #ifndef _MD_P_H | 15 | #ifndef _MD_P_H |
16 | #define _MD_P_H | 16 | #define _MD_P_H |
17 | 17 | ||
18 | #include <linux/types.h> | ||
19 | |||
18 | /* | 20 | /* |
19 | * RAID superblock. | 21 | * RAID superblock. |
20 | * | 22 | * |
diff --git a/include/linux/random.h b/include/linux/random.h index 407ea3646f8f..25d02fe5c9b5 100644 --- a/include/linux/random.h +++ b/include/linux/random.h | |||
@@ -7,6 +7,7 @@ | |||
7 | #ifndef _LINUX_RANDOM_H | 7 | #ifndef _LINUX_RANDOM_H |
8 | #define _LINUX_RANDOM_H | 8 | #define _LINUX_RANDOM_H |
9 | 9 | ||
10 | #include <linux/types.h> | ||
10 | #include <linux/ioctl.h> | 11 | #include <linux/ioctl.h> |
11 | #include <linux/irqnr.h> | 12 | #include <linux/irqnr.h> |
12 | 13 | ||
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index dede0a2cfc45..4c5bcf6ca7e8 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * | 9 | * |
10 | * Author: Pavel Emelianov <xemul@openvz.org> | 10 | * Author: Pavel Emelianov <xemul@openvz.org> |
11 | * | 11 | * |
12 | * See Documentation/controllers/resource_counter.txt for more | 12 | * See Documentation/cgroups/resource_counter.txt for more |
13 | * info about what this counter is. | 13 | * info about what this counter is. |
14 | */ | 14 | */ |
15 | 15 | ||
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index e88f7058b3a1..1e5f6730ff31 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_RTNETLINK_H | 1 | #ifndef __LINUX_RTNETLINK_H |
2 | #define __LINUX_RTNETLINK_H | 2 | #define __LINUX_RTNETLINK_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/netlink.h> | 5 | #include <linux/netlink.h> |
5 | #include <linux/if_link.h> | 6 | #include <linux/if_link.h> |
6 | #include <linux/if_addr.h> | 7 | #include <linux/if_addr.h> |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 4cae9b81a1f8..5a7c76388731 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -293,6 +293,9 @@ extern void sched_show_task(struct task_struct *p); | |||
293 | extern void softlockup_tick(void); | 293 | extern void softlockup_tick(void); |
294 | extern void touch_softlockup_watchdog(void); | 294 | extern void touch_softlockup_watchdog(void); |
295 | extern void touch_all_softlockup_watchdogs(void); | 295 | extern void touch_all_softlockup_watchdogs(void); |
296 | extern int proc_dosoftlockup_thresh(struct ctl_table *table, int write, | ||
297 | struct file *filp, void __user *buffer, | ||
298 | size_t *lenp, loff_t *ppos); | ||
296 | extern unsigned int softlockup_panic; | 299 | extern unsigned int softlockup_panic; |
297 | extern unsigned long sysctl_hung_task_check_count; | 300 | extern unsigned long sysctl_hung_task_check_count; |
298 | extern unsigned long sysctl_hung_task_timeout_secs; | 301 | extern unsigned long sysctl_hung_task_timeout_secs; |
@@ -450,6 +453,7 @@ struct task_cputime { | |||
450 | cputime_t utime; | 453 | cputime_t utime; |
451 | cputime_t stime; | 454 | cputime_t stime; |
452 | unsigned long long sum_exec_runtime; | 455 | unsigned long long sum_exec_runtime; |
456 | spinlock_t lock; | ||
453 | }; | 457 | }; |
454 | /* Alternate field names when used to cache expirations. */ | 458 | /* Alternate field names when used to cache expirations. */ |
455 | #define prof_exp stime | 459 | #define prof_exp stime |
@@ -465,7 +469,7 @@ struct task_cputime { | |||
465 | * used for thread group CPU clock calculations. | 469 | * used for thread group CPU clock calculations. |
466 | */ | 470 | */ |
467 | struct thread_group_cputime { | 471 | struct thread_group_cputime { |
468 | struct task_cputime *totals; | 472 | struct task_cputime totals; |
469 | }; | 473 | }; |
470 | 474 | ||
471 | /* | 475 | /* |
@@ -626,7 +630,6 @@ struct user_struct { | |||
626 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ | 630 | atomic_t inotify_devs; /* How many inotify devs does this user have opened? */ |
627 | #endif | 631 | #endif |
628 | #ifdef CONFIG_EPOLL | 632 | #ifdef CONFIG_EPOLL |
629 | atomic_t epoll_devs; /* The number of epoll descriptors currently open */ | ||
630 | atomic_t epoll_watches; /* The number of file descriptors currently watched */ | 633 | atomic_t epoll_watches; /* The number of file descriptors currently watched */ |
631 | #endif | 634 | #endif |
632 | #ifdef CONFIG_POSIX_MQUEUE | 635 | #ifdef CONFIG_POSIX_MQUEUE |
@@ -2180,24 +2183,30 @@ static inline int spin_needbreak(spinlock_t *lock) | |||
2180 | * Thread group CPU time accounting. | 2183 | * Thread group CPU time accounting. |
2181 | */ | 2184 | */ |
2182 | 2185 | ||
2183 | extern int thread_group_cputime_alloc(struct task_struct *); | 2186 | static inline |
2184 | extern void thread_group_cputime(struct task_struct *, struct task_cputime *); | 2187 | void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times) |
2185 | |||
2186 | static inline void thread_group_cputime_init(struct signal_struct *sig) | ||
2187 | { | 2188 | { |
2188 | sig->cputime.totals = NULL; | 2189 | struct task_cputime *totals = &tsk->signal->cputime.totals; |
2190 | unsigned long flags; | ||
2191 | |||
2192 | spin_lock_irqsave(&totals->lock, flags); | ||
2193 | *times = *totals; | ||
2194 | spin_unlock_irqrestore(&totals->lock, flags); | ||
2189 | } | 2195 | } |
2190 | 2196 | ||
2191 | static inline int thread_group_cputime_clone_thread(struct task_struct *curr) | 2197 | static inline void thread_group_cputime_init(struct signal_struct *sig) |
2192 | { | 2198 | { |
2193 | if (curr->signal->cputime.totals) | 2199 | sig->cputime.totals = (struct task_cputime){ |
2194 | return 0; | 2200 | .utime = cputime_zero, |
2195 | return thread_group_cputime_alloc(curr); | 2201 | .stime = cputime_zero, |
2202 | .sum_exec_runtime = 0, | ||
2203 | }; | ||
2204 | |||
2205 | spin_lock_init(&sig->cputime.totals.lock); | ||
2196 | } | 2206 | } |
2197 | 2207 | ||
2198 | static inline void thread_group_cputime_free(struct signal_struct *sig) | 2208 | static inline void thread_group_cputime_free(struct signal_struct *sig) |
2199 | { | 2209 | { |
2200 | free_percpu(sig->cputime.totals); | ||
2201 | } | 2210 | } |
2202 | 2211 | ||
2203 | /* | 2212 | /* |
diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h index bef0c46d4713..b363b916c909 100644 --- a/include/linux/signalfd.h +++ b/include/linux/signalfd.h | |||
@@ -8,6 +8,7 @@ | |||
8 | #ifndef _LINUX_SIGNALFD_H | 8 | #ifndef _LINUX_SIGNALFD_H |
9 | #define _LINUX_SIGNALFD_H | 9 | #define _LINUX_SIGNALFD_H |
10 | 10 | ||
11 | #include <linux/types.h> | ||
11 | /* For O_CLOEXEC and O_NONBLOCK */ | 12 | /* For O_CLOEXEC and O_NONBLOCK */ |
12 | #include <linux/fcntl.h> | 13 | #include <linux/fcntl.h> |
13 | 14 | ||
diff --git a/include/linux/sound.h b/include/linux/sound.h index 9e2a94feed6b..44dcf0570432 100644 --- a/include/linux/sound.h +++ b/include/linux/sound.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */ | 25 | #define SND_DEV_AMIDI 13 /* Like /dev/midi (obsolete) */ |
26 | #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ | 26 | #define SND_DEV_ADMMIDI 14 /* Like /dev/dmmidi (onsolete) */ |
27 | 27 | ||
28 | #ifdef __KERNEL__ | ||
28 | /* | 29 | /* |
29 | * Sound core interface functions | 30 | * Sound core interface functions |
30 | */ | 31 | */ |
@@ -40,3 +41,4 @@ extern void unregister_sound_special(int unit); | |||
40 | extern void unregister_sound_mixer(int unit); | 41 | extern void unregister_sound_mixer(int unit); |
41 | extern void unregister_sound_midi(int unit); | 42 | extern void unregister_sound_midi(int unit); |
42 | extern void unregister_sound_dsp(int unit); | 43 | extern void unregister_sound_dsp(int unit); |
44 | #endif /* __KERNEL__ */ | ||
diff --git a/include/linux/spi/spidev.h b/include/linux/spi/spidev.h index c93ef9d42a01..95251ccd5a07 100644 --- a/include/linux/spi/spidev.h +++ b/include/linux/spi/spidev.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #ifndef SPIDEV_H | 22 | #ifndef SPIDEV_H |
23 | #define SPIDEV_H | 23 | #define SPIDEV_H |
24 | 24 | ||
25 | #include <linux/types.h> | ||
25 | 26 | ||
26 | /* User space versions of kernel symbols for SPI clocking modes, | 27 | /* User space versions of kernel symbols for SPI clocking modes, |
27 | * matching <linux/spi/spi.h> | 28 | * matching <linux/spi/spi.h> |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 2b409c44db83..c7d9bb1832ba 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -237,6 +237,7 @@ extern int hibernate_nvs_alloc(void); | |||
237 | extern void hibernate_nvs_free(void); | 237 | extern void hibernate_nvs_free(void); |
238 | extern void hibernate_nvs_save(void); | 238 | extern void hibernate_nvs_save(void); |
239 | extern void hibernate_nvs_restore(void); | 239 | extern void hibernate_nvs_restore(void); |
240 | extern bool system_entering_hibernation(void); | ||
240 | #else /* CONFIG_HIBERNATION */ | 241 | #else /* CONFIG_HIBERNATION */ |
241 | static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } | 242 | static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } |
242 | static inline void swsusp_set_page_free(struct page *p) {} | 243 | static inline void swsusp_set_page_free(struct page *p) {} |
@@ -252,6 +253,7 @@ static inline int hibernate_nvs_alloc(void) { return 0; } | |||
252 | static inline void hibernate_nvs_free(void) {} | 253 | static inline void hibernate_nvs_free(void) {} |
253 | static inline void hibernate_nvs_save(void) {} | 254 | static inline void hibernate_nvs_save(void) {} |
254 | static inline void hibernate_nvs_restore(void) {} | 255 | static inline void hibernate_nvs_restore(void) {} |
256 | static inline bool system_entering_hibernation(void) { return false; } | ||
255 | #endif /* CONFIG_HIBERNATION */ | 257 | #endif /* CONFIG_HIBERNATION */ |
256 | 258 | ||
257 | #ifdef CONFIG_PM_SLEEP | 259 | #ifdef CONFIG_PM_SLEEP |
diff --git a/include/linux/swab.h b/include/linux/swab.h index be5284d4a053..ea0c02fd5163 100644 --- a/include/linux/swab.h +++ b/include/linux/swab.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/compiler.h> | 5 | #include <linux/compiler.h> |
6 | #include <asm/byteorder.h> | 6 | #include <asm/swab.h> |
7 | 7 | ||
8 | /* | 8 | /* |
9 | * casts are necessary for constants, because we never know how for sure | 9 | * casts are necessary for constants, because we never know how for sure |
diff --git a/include/linux/synclink.h b/include/linux/synclink.h index c844a229acc9..99b8bdb17b2b 100644 --- a/include/linux/synclink.h +++ b/include/linux/synclink.h | |||
@@ -13,6 +13,8 @@ | |||
13 | #define _SYNCLINK_H_ | 13 | #define _SYNCLINK_H_ |
14 | #define SYNCLINK_H_VERSION 3.6 | 14 | #define SYNCLINK_H_VERSION 3.6 |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
16 | #define BIT0 0x0001 | 18 | #define BIT0 0x0001 |
17 | #define BIT1 0x0002 | 19 | #define BIT1 0x0002 |
18 | #define BIT2 0x0004 | 20 | #define BIT2 0x0004 |
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 18d0a243a7b3..0eda02ff2414 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
@@ -54,6 +54,7 @@ struct compat_stat; | |||
54 | struct compat_timeval; | 54 | struct compat_timeval; |
55 | struct robust_list_head; | 55 | struct robust_list_head; |
56 | struct getcpu_cache; | 56 | struct getcpu_cache; |
57 | struct old_linux_dirent; | ||
57 | 58 | ||
58 | #include <linux/types.h> | 59 | #include <linux/types.h> |
59 | #include <linux/aio_abi.h> | 60 | #include <linux/aio_abi.h> |
@@ -65,6 +66,79 @@ struct getcpu_cache; | |||
65 | #include <linux/quota.h> | 66 | #include <linux/quota.h> |
66 | #include <linux/key.h> | 67 | #include <linux/key.h> |
67 | 68 | ||
69 | #define __SC_DECL1(t1, a1) t1 a1 | ||
70 | #define __SC_DECL2(t2, a2, ...) t2 a2, __SC_DECL1(__VA_ARGS__) | ||
71 | #define __SC_DECL3(t3, a3, ...) t3 a3, __SC_DECL2(__VA_ARGS__) | ||
72 | #define __SC_DECL4(t4, a4, ...) t4 a4, __SC_DECL3(__VA_ARGS__) | ||
73 | #define __SC_DECL5(t5, a5, ...) t5 a5, __SC_DECL4(__VA_ARGS__) | ||
74 | #define __SC_DECL6(t6, a6, ...) t6 a6, __SC_DECL5(__VA_ARGS__) | ||
75 | |||
76 | #define __SC_LONG1(t1, a1) long a1 | ||
77 | #define __SC_LONG2(t2, a2, ...) long a2, __SC_LONG1(__VA_ARGS__) | ||
78 | #define __SC_LONG3(t3, a3, ...) long a3, __SC_LONG2(__VA_ARGS__) | ||
79 | #define __SC_LONG4(t4, a4, ...) long a4, __SC_LONG3(__VA_ARGS__) | ||
80 | #define __SC_LONG5(t5, a5, ...) long a5, __SC_LONG4(__VA_ARGS__) | ||
81 | #define __SC_LONG6(t6, a6, ...) long a6, __SC_LONG5(__VA_ARGS__) | ||
82 | |||
83 | #define __SC_CAST1(t1, a1) (t1) a1 | ||
84 | #define __SC_CAST2(t2, a2, ...) (t2) a2, __SC_CAST1(__VA_ARGS__) | ||
85 | #define __SC_CAST3(t3, a3, ...) (t3) a3, __SC_CAST2(__VA_ARGS__) | ||
86 | #define __SC_CAST4(t4, a4, ...) (t4) a4, __SC_CAST3(__VA_ARGS__) | ||
87 | #define __SC_CAST5(t5, a5, ...) (t5) a5, __SC_CAST4(__VA_ARGS__) | ||
88 | #define __SC_CAST6(t6, a6, ...) (t6) a6, __SC_CAST5(__VA_ARGS__) | ||
89 | |||
90 | #define __SC_TEST(type) BUILD_BUG_ON(sizeof(type) > sizeof(long)) | ||
91 | #define __SC_TEST1(t1, a1) __SC_TEST(t1) | ||
92 | #define __SC_TEST2(t2, a2, ...) __SC_TEST(t2); __SC_TEST1(__VA_ARGS__) | ||
93 | #define __SC_TEST3(t3, a3, ...) __SC_TEST(t3); __SC_TEST2(__VA_ARGS__) | ||
94 | #define __SC_TEST4(t4, a4, ...) __SC_TEST(t4); __SC_TEST3(__VA_ARGS__) | ||
95 | #define __SC_TEST5(t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__) | ||
96 | #define __SC_TEST6(t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__) | ||
97 | |||
98 | #define SYSCALL_DEFINE0(name) asmlinkage long sys_##name(void) | ||
99 | #define SYSCALL_DEFINE1(...) SYSCALL_DEFINEx(1, __VA_ARGS__) | ||
100 | #define SYSCALL_DEFINE2(...) SYSCALL_DEFINEx(2, __VA_ARGS__) | ||
101 | #define SYSCALL_DEFINE3(...) SYSCALL_DEFINEx(3, __VA_ARGS__) | ||
102 | #define SYSCALL_DEFINE4(...) SYSCALL_DEFINEx(4, __VA_ARGS__) | ||
103 | #define SYSCALL_DEFINE5(...) SYSCALL_DEFINEx(5, __VA_ARGS__) | ||
104 | #define SYSCALL_DEFINE6(...) SYSCALL_DEFINEx(6, __VA_ARGS__) | ||
105 | |||
106 | #ifdef CONFIG_PPC64 | ||
107 | #define SYSCALL_ALIAS(alias, name) \ | ||
108 | asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \ | ||
109 | "\t.globl ." #alias "\n\t.set ." #alias ", ." #name) | ||
110 | #else | ||
111 | #ifdef CONFIG_ALPHA | ||
112 | #define SYSCALL_ALIAS(alias, name) \ | ||
113 | asm ( #alias " = " #name "\n\t.globl " #alias) | ||
114 | #else | ||
115 | #define SYSCALL_ALIAS(alias, name) \ | ||
116 | asm ("\t.globl " #alias "\n\t.set " #alias ", " #name) | ||
117 | #endif | ||
118 | #endif | ||
119 | |||
120 | #ifdef CONFIG_HAVE_SYSCALL_WRAPPERS | ||
121 | |||
122 | #define SYSCALL_DEFINE(name) static inline long SYSC_##name | ||
123 | #define SYSCALL_DEFINEx(x, name, ...) \ | ||
124 | asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__)); \ | ||
125 | static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__)); \ | ||
126 | asmlinkage long SyS_##name(__SC_LONG##x(__VA_ARGS__)) \ | ||
127 | { \ | ||
128 | __SC_TEST##x(__VA_ARGS__); \ | ||
129 | return (long) SYSC_##name(__SC_CAST##x(__VA_ARGS__)); \ | ||
130 | } \ | ||
131 | SYSCALL_ALIAS(sys_##name, SyS_##name); \ | ||
132 | static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__)) | ||
133 | |||
134 | #else /* CONFIG_HAVE_SYSCALL_WRAPPERS */ | ||
135 | |||
136 | #define SYSCALL_DEFINE(name) asmlinkage long sys_##name | ||
137 | #define SYSCALL_DEFINEx(x, name, ...) \ | ||
138 | asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__)) | ||
139 | |||
140 | #endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */ | ||
141 | |||
68 | asmlinkage long sys_time(time_t __user *tloc); | 142 | asmlinkage long sys_time(time_t __user *tloc); |
69 | asmlinkage long sys_stime(time_t __user *tptr); | 143 | asmlinkage long sys_stime(time_t __user *tptr); |
70 | asmlinkage long sys_gettimeofday(struct timeval __user *tv, | 144 | asmlinkage long sys_gettimeofday(struct timeval __user *tv, |
@@ -77,7 +151,7 @@ asmlinkage long sys_times(struct tms __user *tbuf); | |||
77 | 151 | ||
78 | asmlinkage long sys_gettid(void); | 152 | asmlinkage long sys_gettid(void); |
79 | asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp); | 153 | asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp); |
80 | asmlinkage unsigned long sys_alarm(unsigned int seconds); | 154 | asmlinkage long sys_alarm(unsigned int seconds); |
81 | asmlinkage long sys_getpid(void); | 155 | asmlinkage long sys_getpid(void); |
82 | asmlinkage long sys_getppid(void); | 156 | asmlinkage long sys_getppid(void); |
83 | asmlinkage long sys_getuid(void); | 157 | asmlinkage long sys_getuid(void); |
@@ -166,7 +240,7 @@ asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, | |||
166 | unsigned long flags); | 240 | unsigned long flags); |
167 | 241 | ||
168 | asmlinkage long sys_exit(int error_code); | 242 | asmlinkage long sys_exit(int error_code); |
169 | asmlinkage void sys_exit_group(int error_code); | 243 | asmlinkage long sys_exit_group(int error_code); |
170 | asmlinkage long sys_wait4(pid_t pid, int __user *stat_addr, | 244 | asmlinkage long sys_wait4(pid_t pid, int __user *stat_addr, |
171 | int options, struct rusage __user *ru); | 245 | int options, struct rusage __user *ru); |
172 | asmlinkage long sys_waitid(int which, pid_t pid, | 246 | asmlinkage long sys_waitid(int which, pid_t pid, |
@@ -196,7 +270,7 @@ asmlinkage long sys_tkill(int pid, int sig); | |||
196 | asmlinkage long sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo); | 270 | asmlinkage long sys_rt_sigqueueinfo(int pid, int sig, siginfo_t __user *uinfo); |
197 | asmlinkage long sys_sgetmask(void); | 271 | asmlinkage long sys_sgetmask(void); |
198 | asmlinkage long sys_ssetmask(int newmask); | 272 | asmlinkage long sys_ssetmask(int newmask); |
199 | asmlinkage unsigned long sys_signal(int sig, __sighandler_t handler); | 273 | asmlinkage long sys_signal(int sig, __sighandler_t handler); |
200 | asmlinkage long sys_pause(void); | 274 | asmlinkage long sys_pause(void); |
201 | 275 | ||
202 | asmlinkage long sys_sync(void); | 276 | asmlinkage long sys_sync(void); |
@@ -246,29 +320,29 @@ asmlinkage long sys_lsetxattr(const char __user *path, const char __user *name, | |||
246 | const void __user *value, size_t size, int flags); | 320 | const void __user *value, size_t size, int flags); |
247 | asmlinkage long sys_fsetxattr(int fd, const char __user *name, | 321 | asmlinkage long sys_fsetxattr(int fd, const char __user *name, |
248 | const void __user *value, size_t size, int flags); | 322 | const void __user *value, size_t size, int flags); |
249 | asmlinkage ssize_t sys_getxattr(const char __user *path, const char __user *name, | 323 | asmlinkage long sys_getxattr(const char __user *path, const char __user *name, |
250 | void __user *value, size_t size); | 324 | void __user *value, size_t size); |
251 | asmlinkage ssize_t sys_lgetxattr(const char __user *path, const char __user *name, | 325 | asmlinkage long sys_lgetxattr(const char __user *path, const char __user *name, |
252 | void __user *value, size_t size); | 326 | void __user *value, size_t size); |
253 | asmlinkage ssize_t sys_fgetxattr(int fd, const char __user *name, | 327 | asmlinkage long sys_fgetxattr(int fd, const char __user *name, |
254 | void __user *value, size_t size); | 328 | void __user *value, size_t size); |
255 | asmlinkage ssize_t sys_listxattr(const char __user *path, char __user *list, | 329 | asmlinkage long sys_listxattr(const char __user *path, char __user *list, |
256 | size_t size); | 330 | size_t size); |
257 | asmlinkage ssize_t sys_llistxattr(const char __user *path, char __user *list, | 331 | asmlinkage long sys_llistxattr(const char __user *path, char __user *list, |
258 | size_t size); | 332 | size_t size); |
259 | asmlinkage ssize_t sys_flistxattr(int fd, char __user *list, size_t size); | 333 | asmlinkage long sys_flistxattr(int fd, char __user *list, size_t size); |
260 | asmlinkage long sys_removexattr(const char __user *path, | 334 | asmlinkage long sys_removexattr(const char __user *path, |
261 | const char __user *name); | 335 | const char __user *name); |
262 | asmlinkage long sys_lremovexattr(const char __user *path, | 336 | asmlinkage long sys_lremovexattr(const char __user *path, |
263 | const char __user *name); | 337 | const char __user *name); |
264 | asmlinkage long sys_fremovexattr(int fd, const char __user *name); | 338 | asmlinkage long sys_fremovexattr(int fd, const char __user *name); |
265 | 339 | ||
266 | asmlinkage unsigned long sys_brk(unsigned long brk); | 340 | asmlinkage long sys_brk(unsigned long brk); |
267 | asmlinkage long sys_mprotect(unsigned long start, size_t len, | 341 | asmlinkage long sys_mprotect(unsigned long start, size_t len, |
268 | unsigned long prot); | 342 | unsigned long prot); |
269 | asmlinkage unsigned long sys_mremap(unsigned long addr, | 343 | asmlinkage long sys_mremap(unsigned long addr, |
270 | unsigned long old_len, unsigned long new_len, | 344 | unsigned long old_len, unsigned long new_len, |
271 | unsigned long flags, unsigned long new_addr); | 345 | unsigned long flags, unsigned long new_addr); |
272 | asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size, | 346 | asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size, |
273 | unsigned long prot, unsigned long pgoff, | 347 | unsigned long prot, unsigned long pgoff, |
274 | unsigned long flags); | 348 | unsigned long flags); |
@@ -321,10 +395,10 @@ asmlinkage long sys_io_submit(aio_context_t, long, | |||
321 | struct iocb __user * __user *); | 395 | struct iocb __user * __user *); |
322 | asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb, | 396 | asmlinkage long sys_io_cancel(aio_context_t ctx_id, struct iocb __user *iocb, |
323 | struct io_event __user *result); | 397 | struct io_event __user *result); |
324 | asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, | 398 | asmlinkage long sys_sendfile(int out_fd, int in_fd, |
325 | off_t __user *offset, size_t count); | 399 | off_t __user *offset, size_t count); |
326 | asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd, | 400 | asmlinkage long sys_sendfile64(int out_fd, int in_fd, |
327 | loff_t __user *offset, size_t count); | 401 | loff_t __user *offset, size_t count); |
328 | asmlinkage long sys_readlink(const char __user *path, | 402 | asmlinkage long sys_readlink(const char __user *path, |
329 | char __user *buf, int bufsiz); | 403 | char __user *buf, int bufsiz); |
330 | asmlinkage long sys_creat(const char __user *pathname, int mode); | 404 | asmlinkage long sys_creat(const char __user *pathname, int mode); |
@@ -368,26 +442,25 @@ asmlinkage long sys_utime(char __user *filename, | |||
368 | struct utimbuf __user *times); | 442 | struct utimbuf __user *times); |
369 | asmlinkage long sys_utimes(char __user *filename, | 443 | asmlinkage long sys_utimes(char __user *filename, |
370 | struct timeval __user *utimes); | 444 | struct timeval __user *utimes); |
371 | asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, | 445 | asmlinkage long sys_lseek(unsigned int fd, off_t offset, |
372 | unsigned int origin); | 446 | unsigned int origin); |
373 | asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, | 447 | asmlinkage long sys_llseek(unsigned int fd, unsigned long offset_high, |
374 | unsigned long offset_low, loff_t __user *result, | 448 | unsigned long offset_low, loff_t __user *result, |
375 | unsigned int origin); | 449 | unsigned int origin); |
376 | asmlinkage ssize_t sys_read(unsigned int fd, char __user *buf, | 450 | asmlinkage long sys_read(unsigned int fd, char __user *buf, size_t count); |
377 | size_t count); | 451 | asmlinkage long sys_readahead(int fd, loff_t offset, size_t count); |
378 | asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count); | 452 | asmlinkage long sys_readv(unsigned long fd, |
379 | asmlinkage ssize_t sys_readv(unsigned long fd, | 453 | const struct iovec __user *vec, |
380 | const struct iovec __user *vec, | 454 | unsigned long vlen); |
381 | unsigned long vlen); | 455 | asmlinkage long sys_write(unsigned int fd, const char __user *buf, |
382 | asmlinkage ssize_t sys_write(unsigned int fd, const char __user *buf, | 456 | size_t count); |
383 | size_t count); | 457 | asmlinkage long sys_writev(unsigned long fd, |
384 | asmlinkage ssize_t sys_writev(unsigned long fd, | 458 | const struct iovec __user *vec, |
385 | const struct iovec __user *vec, | 459 | unsigned long vlen); |
386 | unsigned long vlen); | 460 | asmlinkage long sys_pread64(unsigned int fd, char __user *buf, |
387 | asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, | 461 | size_t count, loff_t pos); |
388 | size_t count, loff_t pos); | 462 | asmlinkage long sys_pwrite64(unsigned int fd, const char __user *buf, |
389 | asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char __user *buf, | 463 | size_t count, loff_t pos); |
390 | size_t count, loff_t pos); | ||
391 | asmlinkage long sys_getcwd(char __user *buf, unsigned long size); | 464 | asmlinkage long sys_getcwd(char __user *buf, unsigned long size); |
392 | asmlinkage long sys_mkdir(const char __user *pathname, int mode); | 465 | asmlinkage long sys_mkdir(const char __user *pathname, int mode); |
393 | asmlinkage long sys_chdir(const char __user *filename); | 466 | asmlinkage long sys_chdir(const char __user *filename); |
@@ -476,7 +549,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf); | |||
476 | asmlinkage long sys_mq_open(const char __user *name, int oflag, mode_t mode, struct mq_attr __user *attr); | 549 | asmlinkage long sys_mq_open(const char __user *name, int oflag, mode_t mode, struct mq_attr __user *attr); |
477 | asmlinkage long sys_mq_unlink(const char __user *name); | 550 | asmlinkage long sys_mq_unlink(const char __user *name); |
478 | asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec __user *abs_timeout); | 551 | asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec __user *abs_timeout); |
479 | asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct timespec __user *abs_timeout); | 552 | asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct timespec __user *abs_timeout); |
480 | asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification); | 553 | asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification); |
481 | asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat); | 554 | asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat); |
482 | 555 | ||
@@ -530,11 +603,6 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages, | |||
530 | const int __user *nodes, | 603 | const int __user *nodes, |
531 | int __user *status, | 604 | int __user *status, |
532 | int flags); | 605 | int flags); |
533 | asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_page, | ||
534 | __u32 __user *pages, | ||
535 | const int __user *nodes, | ||
536 | int __user *status, | ||
537 | int flags); | ||
538 | asmlinkage long sys_mbind(unsigned long start, unsigned long len, | 606 | asmlinkage long sys_mbind(unsigned long start, unsigned long len, |
539 | unsigned long mode, | 607 | unsigned long mode, |
540 | unsigned long __user *nmask, | 608 | unsigned long __user *nmask, |
@@ -583,13 +651,6 @@ asmlinkage long sys_readlinkat(int dfd, const char __user *path, char __user *bu | |||
583 | int bufsiz); | 651 | int bufsiz); |
584 | asmlinkage long sys_utimensat(int dfd, char __user *filename, | 652 | asmlinkage long sys_utimensat(int dfd, char __user *filename, |
585 | struct timespec __user *utimes, int flags); | 653 | struct timespec __user *utimes, int flags); |
586 | asmlinkage long compat_sys_futimesat(unsigned int dfd, char __user *filename, | ||
587 | struct compat_timeval __user *t); | ||
588 | asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user * filename, | ||
589 | struct compat_stat __user *statbuf, | ||
590 | int flag); | ||
591 | asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename, | ||
592 | int flags, int mode); | ||
593 | asmlinkage long sys_unshare(unsigned long unshare_flags); | 654 | asmlinkage long sys_unshare(unsigned long unshare_flags); |
594 | 655 | ||
595 | asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, | 656 | asmlinkage long sys_splice(int fd_in, loff_t __user *off_in, |
@@ -621,6 +682,15 @@ asmlinkage long sys_timerfd_gettime(int ufd, struct itimerspec __user *otmr); | |||
621 | asmlinkage long sys_eventfd(unsigned int count); | 682 | asmlinkage long sys_eventfd(unsigned int count); |
622 | asmlinkage long sys_eventfd2(unsigned int count, int flags); | 683 | asmlinkage long sys_eventfd2(unsigned int count, int flags); |
623 | asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len); | 684 | asmlinkage long sys_fallocate(int fd, int mode, loff_t offset, loff_t len); |
685 | asmlinkage long sys_old_readdir(unsigned int, struct old_linux_dirent __user *, unsigned int); | ||
686 | asmlinkage long sys_pselect6(int, fd_set __user *, fd_set __user *, | ||
687 | fd_set __user *, struct timespec __user *, | ||
688 | void __user *); | ||
689 | asmlinkage long sys_ppoll(struct pollfd __user *, unsigned int, | ||
690 | struct timespec __user *, const sigset_t __user *, | ||
691 | size_t); | ||
692 | asmlinkage long sys_pipe2(int __user *, int); | ||
693 | asmlinkage long sys_pipe(int __user *); | ||
624 | 694 | ||
625 | int kernel_execve(const char *filename, char *const argv[], char *const envp[]); | 695 | int kernel_execve(const char *filename, char *const argv[], char *const envp[]); |
626 | 696 | ||
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h index 18269e956a71..341dddb55090 100644 --- a/include/linux/taskstats.h +++ b/include/linux/taskstats.h | |||
@@ -16,6 +16,8 @@ | |||
16 | #ifndef _LINUX_TASKSTATS_H | 16 | #ifndef _LINUX_TASKSTATS_H |
17 | #define _LINUX_TASKSTATS_H | 17 | #define _LINUX_TASKSTATS_H |
18 | 18 | ||
19 | #include <linux/types.h> | ||
20 | |||
19 | /* Format for per-task data returned to userland when | 21 | /* Format for per-task data returned to userland when |
20 | * - a task exits | 22 | * - a task exits |
21 | * - listener requests stats for a task | 23 | * - listener requests stats for a task |
diff --git a/include/linux/tc_act/tc_gact.h b/include/linux/tc_act/tc_gact.h index 23a03eb630db..e895c0a39629 100644 --- a/include/linux/tc_act/tc_gact.h +++ b/include/linux/tc_act/tc_gact.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_GACT_H | 1 | #ifndef __LINUX_TC_GACT_H |
2 | #define __LINUX_TC_GACT_H | 2 | #define __LINUX_TC_GACT_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | #define TCA_ACT_GACT 5 | 7 | #define TCA_ACT_GACT 5 |
diff --git a/include/linux/tc_act/tc_mirred.h b/include/linux/tc_act/tc_mirred.h index 71d63409d568..0a99ab60d610 100644 --- a/include/linux/tc_act/tc_mirred.h +++ b/include/linux/tc_act/tc_mirred.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_MIR_H | 1 | #ifndef __LINUX_TC_MIR_H |
2 | #define __LINUX_TC_MIR_H | 2 | #define __LINUX_TC_MIR_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | #define TCA_ACT_MIRRED 8 | 7 | #define TCA_ACT_MIRRED 8 |
diff --git a/include/linux/tc_act/tc_pedit.h b/include/linux/tc_act/tc_pedit.h index 83e56e32e8e0..54ce9064115a 100644 --- a/include/linux/tc_act/tc_pedit.h +++ b/include/linux/tc_act/tc_pedit.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_PED_H | 1 | #ifndef __LINUX_TC_PED_H |
2 | #define __LINUX_TC_PED_H | 2 | #define __LINUX_TC_PED_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | #define TCA_ACT_PEDIT 7 | 7 | #define TCA_ACT_PEDIT 7 |
diff --git a/include/linux/tc_ematch/tc_em_cmp.h b/include/linux/tc_ematch/tc_em_cmp.h index c7f4d43618fd..38e7f7b25ec2 100644 --- a/include/linux/tc_ematch/tc_em_cmp.h +++ b/include/linux/tc_ematch/tc_em_cmp.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_EM_CMP_H | 1 | #ifndef __LINUX_TC_EM_CMP_H |
2 | #define __LINUX_TC_EM_CMP_H | 2 | #define __LINUX_TC_EM_CMP_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | struct tcf_em_cmp | 7 | struct tcf_em_cmp |
diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h index c50d2ba5caf0..dcfb733fa1f6 100644 --- a/include/linux/tc_ematch/tc_em_meta.h +++ b/include/linux/tc_ematch/tc_em_meta.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_EM_META_H | 1 | #ifndef __LINUX_TC_EM_META_H |
2 | #define __LINUX_TC_EM_META_H | 2 | #define __LINUX_TC_EM_META_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | enum | 7 | enum |
diff --git a/include/linux/tc_ematch/tc_em_nbyte.h b/include/linux/tc_ematch/tc_em_nbyte.h index f19d1f58ec9d..9ed8c2e58488 100644 --- a/include/linux/tc_ematch/tc_em_nbyte.h +++ b/include/linux/tc_ematch/tc_em_nbyte.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_EM_NBYTE_H | 1 | #ifndef __LINUX_TC_EM_NBYTE_H |
2 | #define __LINUX_TC_EM_NBYTE_H | 2 | #define __LINUX_TC_EM_NBYTE_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | struct tcf_em_nbyte | 7 | struct tcf_em_nbyte |
diff --git a/include/linux/tc_ematch/tc_em_text.h b/include/linux/tc_ematch/tc_em_text.h index 7cd43e99c7f5..d12a73a225fc 100644 --- a/include/linux/tc_ematch/tc_em_text.h +++ b/include/linux/tc_ematch/tc_em_text.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __LINUX_TC_EM_TEXT_H | 1 | #ifndef __LINUX_TC_EM_TEXT_H |
2 | #define __LINUX_TC_EM_TEXT_H | 2 | #define __LINUX_TC_EM_TEXT_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
4 | #include <linux/pkt_cls.h> | 5 | #include <linux/pkt_cls.h> |
5 | 6 | ||
6 | #define TC_EM_TEXT_ALGOSIZ 16 | 7 | #define TC_EM_TEXT_ALGOSIZ 16 |
diff --git a/include/linux/usb.h b/include/linux/usb.h index 85ee9be9361e..88079fd60235 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -418,6 +418,8 @@ struct usb_tt; | |||
418 | * @autosuspend_disabled: autosuspend disabled by the user | 418 | * @autosuspend_disabled: autosuspend disabled by the user |
419 | * @autoresume_disabled: autoresume disabled by the user | 419 | * @autoresume_disabled: autoresume disabled by the user |
420 | * @skip_sys_resume: skip the next system resume | 420 | * @skip_sys_resume: skip the next system resume |
421 | * @wusb_dev: if this is a Wireless USB device, link to the WUSB | ||
422 | * specific data for the device. | ||
421 | * | 423 | * |
422 | * Notes: | 424 | * Notes: |
423 | * Usbcore drivers should not set usbdev->state directly. Instead use | 425 | * Usbcore drivers should not set usbdev->state directly. Instead use |
diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h index 18a729343ffa..3c86ed25a04c 100644 --- a/include/linux/usb/cdc.h +++ b/include/linux/usb/cdc.h | |||
@@ -9,6 +9,8 @@ | |||
9 | #ifndef __LINUX_USB_CDC_H | 9 | #ifndef __LINUX_USB_CDC_H |
10 | #define __LINUX_USB_CDC_H | 10 | #define __LINUX_USB_CDC_H |
11 | 11 | ||
12 | #include <linux/types.h> | ||
13 | |||
12 | #define USB_CDC_SUBCLASS_ACM 0x02 | 14 | #define USB_CDC_SUBCLASS_ACM 0x02 |
13 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 | 15 | #define USB_CDC_SUBCLASS_ETHERNET 0x06 |
14 | #define USB_CDC_SUBCLASS_WHCM 0x08 | 16 | #define USB_CDC_SUBCLASS_WHCM 0x08 |
diff --git a/include/linux/usb/gadgetfs.h b/include/linux/usb/gadgetfs.h index ea45f265ec05..612102e4d75e 100644 --- a/include/linux/usb/gadgetfs.h +++ b/include/linux/usb/gadgetfs.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifndef __LINUX_USB_GADGETFS_H | 18 | #ifndef __LINUX_USB_GADGETFS_H |
19 | #define __LINUX_USB_GADGETFS_H | 19 | #define __LINUX_USB_GADGETFS_H |
20 | 20 | ||
21 | #include <asm/types.h> | 21 | #include <linux/types.h> |
22 | #include <asm/ioctl.h> | 22 | #include <asm/ioctl.h> |
23 | 23 | ||
24 | #include <linux/usb/ch9.h> | 24 | #include <linux/usb/ch9.h> |
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index ba09fe88adda..7d3822243074 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h | |||
@@ -197,7 +197,9 @@ extern int usbnet_nway_reset(struct net_device *net); | |||
197 | #define devdbg(usbnet, fmt, arg...) \ | 197 | #define devdbg(usbnet, fmt, arg...) \ |
198 | printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg) | 198 | printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , ## arg) |
199 | #else | 199 | #else |
200 | #define devdbg(usbnet, fmt, arg...) do {} while(0) | 200 | #define devdbg(usbnet, fmt, arg...) \ |
201 | ({ if (0) printk(KERN_DEBUG "%s: " fmt "\n" , (usbnet)->net->name , \ | ||
202 | ## arg); 0; }) | ||
201 | #endif | 203 | #endif |
202 | 204 | ||
203 | #define deverr(usbnet, fmt, arg...) \ | 205 | #define deverr(usbnet, fmt, arg...) \ |
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h index 121e26da2c18..e26c0c86a6ea 100644 --- a/include/linux/video_decoder.h +++ b/include/linux/video_decoder.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_VIDEO_DECODER_H | 1 | #ifndef _LINUX_VIDEO_DECODER_H |
2 | #define _LINUX_VIDEO_DECODER_H | 2 | #define _LINUX_VIDEO_DECODER_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | #define HAVE_VIDEO_DECODER 1 | 6 | #define HAVE_VIDEO_DECODER 1 |
5 | 7 | ||
6 | struct video_decoder_capability { /* this name is too long */ | 8 | struct video_decoder_capability { /* this name is too long */ |
diff --git a/include/linux/video_encoder.h b/include/linux/video_encoder.h index 4b0e6907a7b4..b7b6423bbb8a 100644 --- a/include/linux/video_encoder.h +++ b/include/linux/video_encoder.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _LINUX_VIDEO_ENCODER_H | 1 | #ifndef _LINUX_VIDEO_ENCODER_H |
2 | #define _LINUX_VIDEO_ENCODER_H | 2 | #define _LINUX_VIDEO_ENCODER_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | struct video_encoder_capability { /* this name is too long */ | 6 | struct video_encoder_capability { /* this name is too long */ |
5 | __u32 flags; | 7 | __u32 flags; |
6 | #define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ | 8 | #define VIDEO_ENCODER_PAL 1 /* can encode PAL signal */ |
diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 15a653d41132..837f392fbe97 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #ifndef __LINUX_VIDEODEV_H | 12 | #ifndef __LINUX_VIDEODEV_H |
13 | #define __LINUX_VIDEODEV_H | 13 | #define __LINUX_VIDEODEV_H |
14 | 14 | ||
15 | #include <linux/types.h> | ||
15 | #include <linux/ioctl.h> | 16 | #include <linux/ioctl.h> |
16 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
17 | 18 | ||
diff --git a/include/linux/virtio_blk.h b/include/linux/virtio_blk.h index c1aef85243bf..94c56d29869d 100644 --- a/include/linux/virtio_blk.h +++ b/include/linux/virtio_blk.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _LINUX_VIRTIO_BLK_H | 2 | #define _LINUX_VIRTIO_BLK_H |
3 | /* This header is BSD licensed so anyone can use the definitions to implement | 3 | /* This header is BSD licensed so anyone can use the definitions to implement |
4 | * compatible drivers/servers. */ | 4 | * compatible drivers/servers. */ |
5 | #include <linux/types.h> | ||
5 | #include <linux/virtio_config.h> | 6 | #include <linux/virtio_config.h> |
6 | 7 | ||
7 | /* The ID for virtio_block */ | 8 | /* The ID for virtio_block */ |
diff --git a/include/linux/virtio_console.h b/include/linux/virtio_console.h index 7615ffcdd555..dc161115ae35 100644 --- a/include/linux/virtio_console.h +++ b/include/linux/virtio_console.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #ifndef _LINUX_VIRTIO_CONSOLE_H | 1 | #ifndef _LINUX_VIRTIO_CONSOLE_H |
2 | #define _LINUX_VIRTIO_CONSOLE_H | 2 | #define _LINUX_VIRTIO_CONSOLE_H |
3 | #include <linux/types.h> | ||
3 | #include <linux/virtio_config.h> | 4 | #include <linux/virtio_config.h> |
4 | /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so | 5 | /* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so |
5 | * anyone can use the definitions to implement compatible drivers/servers. */ | 6 | * anyone can use the definitions to implement compatible drivers/servers. */ |
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 5cdd0aa8bde9..3efa86c3ecb3 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h | |||
@@ -2,6 +2,7 @@ | |||
2 | #define _LINUX_VIRTIO_NET_H | 2 | #define _LINUX_VIRTIO_NET_H |
3 | /* This header is BSD licensed so anyone can use the definitions to implement | 3 | /* This header is BSD licensed so anyone can use the definitions to implement |
4 | * compatible drivers/servers. */ | 4 | * compatible drivers/servers. */ |
5 | #include <linux/types.h> | ||
5 | #include <linux/virtio_config.h> | 6 | #include <linux/virtio_config.h> |
6 | 7 | ||
7 | /* The ID for virtio_net */ | 8 | /* The ID for virtio_net */ |
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index b36291130f22..3cd51e579ab1 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
@@ -118,12 +118,24 @@ struct execute_work { | |||
118 | init_timer(&(_work)->timer); \ | 118 | init_timer(&(_work)->timer); \ |
119 | } while (0) | 119 | } while (0) |
120 | 120 | ||
121 | #define INIT_DELAYED_WORK_ON_STACK(_work, _func) \ | ||
122 | do { \ | ||
123 | INIT_WORK(&(_work)->work, (_func)); \ | ||
124 | init_timer_on_stack(&(_work)->timer); \ | ||
125 | } while (0) | ||
126 | |||
121 | #define INIT_DELAYED_WORK_DEFERRABLE(_work, _func) \ | 127 | #define INIT_DELAYED_WORK_DEFERRABLE(_work, _func) \ |
122 | do { \ | 128 | do { \ |
123 | INIT_WORK(&(_work)->work, (_func)); \ | 129 | INIT_WORK(&(_work)->work, (_func)); \ |
124 | init_timer_deferrable(&(_work)->timer); \ | 130 | init_timer_deferrable(&(_work)->timer); \ |
125 | } while (0) | 131 | } while (0) |
126 | 132 | ||
133 | #define INIT_DELAYED_WORK_ON_STACK(_work, _func) \ | ||
134 | do { \ | ||
135 | INIT_WORK(&(_work)->work, (_func)); \ | ||
136 | init_timer_on_stack(&(_work)->timer); \ | ||
137 | } while (0) | ||
138 | |||
127 | /** | 139 | /** |
128 | * work_pending - Find out whether a work item is currently pending | 140 | * work_pending - Find out whether a work item is currently pending |
129 | * @work: The work item in question | 141 | * @work: The work item in question |
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 9bf4ccc93dbf..55e41afd95ef 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
@@ -94,16 +94,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); | |||
94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 94 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
95 | match them all). Ignore any errors. Note that you cannot add or delete | 95 | match them all). Ignore any errors. Note that you cannot add or delete |
96 | a subdev while walking the subdevs list. */ | 96 | a subdev while walking the subdevs list. */ |
97 | #define v4l2_device_call_all(dev, grp_id, o, f, args...) \ | 97 | #define v4l2_device_call_all(dev, grpid, o, f, args...) \ |
98 | __v4l2_device_call_subdevs(dev, \ | 98 | __v4l2_device_call_subdevs(dev, \ |
99 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 99 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
100 | 100 | ||
101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then | 101 | /* Call the specified callback for all subdevs matching grp_id (if 0, then |
102 | match them all). If the callback returns an error other than 0 or | 102 | match them all). If the callback returns an error other than 0 or |
103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot | 103 | -ENOIOCTLCMD, then return with that error code. Note that you cannot |
104 | add or delete a subdev while walking the subdevs list. */ | 104 | add or delete a subdev while walking the subdevs list. */ |
105 | #define v4l2_device_call_until_err(dev, grp_id, o, f, args...) \ | 105 | #define v4l2_device_call_until_err(dev, grpid, o, f, args...) \ |
106 | __v4l2_device_call_subdevs_until_err(dev, \ | 106 | __v4l2_device_call_subdevs_until_err(dev, \ |
107 | !(grp_id) || sd->grp_id == (grp_id), o, f , ##args) | 107 | !(grpid) || sd->grp_id == (grpid), o, f , ##args) |
108 | 108 | ||
109 | #endif | 109 | #endif |
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index 90edd22d343c..dda47f0082e9 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h | |||
@@ -49,7 +49,7 @@ struct scatterlist* videobuf_pages_to_sg(struct page **pages, int nr_pages, | |||
49 | * does memory allocation too using vmalloc_32(). | 49 | * does memory allocation too using vmalloc_32(). |
50 | * | 50 | * |
51 | * videobuf_dma_*() | 51 | * videobuf_dma_*() |
52 | * see Documentation/DMA-mapping.txt, these functions to | 52 | * see Documentation/PCI/PCI-DMA-mapping.txt, these functions to |
53 | * basically the same. The map function does also build a | 53 | * basically the same. The map function does also build a |
54 | * scatterlist for the buffer (and unmap frees it ...) | 54 | * scatterlist for the buffer (and unmap frees it ...) |
55 | * | 55 | * |
diff --git a/include/mtd/inftl-user.h b/include/mtd/inftl-user.h index e17eda302b2d..d409d489d900 100644 --- a/include/mtd/inftl-user.h +++ b/include/mtd/inftl-user.h | |||
@@ -6,6 +6,8 @@ | |||
6 | #ifndef __MTD_INFTL_USER_H__ | 6 | #ifndef __MTD_INFTL_USER_H__ |
7 | #define __MTD_INFTL_USER_H__ | 7 | #define __MTD_INFTL_USER_H__ |
8 | 8 | ||
9 | #include <linux/types.h> | ||
10 | |||
9 | #define OSAK_VERSION 0x5120 | 11 | #define OSAK_VERSION 0x5120 |
10 | #define PERCENTUSED 98 | 12 | #define PERCENTUSED 98 |
11 | 13 | ||
diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 2dc2eb2b8e22..296efae3525e 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h | |||
@@ -40,37 +40,37 @@ | |||
40 | * UBI volume creation | 40 | * UBI volume creation |
41 | * ~~~~~~~~~~~~~~~~~~~ | 41 | * ~~~~~~~~~~~~~~~~~~~ |
42 | * | 42 | * |
43 | * UBI volumes are created via the %UBI_IOCMKVOL IOCTL command of UBI character | 43 | * UBI volumes are created via the %UBI_IOCMKVOL ioctl command of UBI character |
44 | * device. A &struct ubi_mkvol_req object has to be properly filled and a | 44 | * device. A &struct ubi_mkvol_req object has to be properly filled and a |
45 | * pointer to it has to be passed to the IOCTL. | 45 | * pointer to it has to be passed to the ioctl. |
46 | * | 46 | * |
47 | * UBI volume deletion | 47 | * UBI volume deletion |
48 | * ~~~~~~~~~~~~~~~~~~~ | 48 | * ~~~~~~~~~~~~~~~~~~~ |
49 | * | 49 | * |
50 | * To delete a volume, the %UBI_IOCRMVOL IOCTL command of the UBI character | 50 | * To delete a volume, the %UBI_IOCRMVOL ioctl command of the UBI character |
51 | * device should be used. A pointer to the 32-bit volume ID hast to be passed | 51 | * device should be used. A pointer to the 32-bit volume ID hast to be passed |
52 | * to the IOCTL. | 52 | * to the ioctl. |
53 | * | 53 | * |
54 | * UBI volume re-size | 54 | * UBI volume re-size |
55 | * ~~~~~~~~~~~~~~~~~~ | 55 | * ~~~~~~~~~~~~~~~~~~ |
56 | * | 56 | * |
57 | * To re-size a volume, the %UBI_IOCRSVOL IOCTL command of the UBI character | 57 | * To re-size a volume, the %UBI_IOCRSVOL ioctl command of the UBI character |
58 | * device should be used. A &struct ubi_rsvol_req object has to be properly | 58 | * device should be used. A &struct ubi_rsvol_req object has to be properly |
59 | * filled and a pointer to it has to be passed to the IOCTL. | 59 | * filled and a pointer to it has to be passed to the ioctl. |
60 | * | 60 | * |
61 | * UBI volumes re-name | 61 | * UBI volumes re-name |
62 | * ~~~~~~~~~~~~~~~~~~~ | 62 | * ~~~~~~~~~~~~~~~~~~~ |
63 | * | 63 | * |
64 | * To re-name several volumes atomically at one go, the %UBI_IOCRNVOL command | 64 | * To re-name several volumes atomically at one go, the %UBI_IOCRNVOL command |
65 | * of the UBI character device should be used. A &struct ubi_rnvol_req object | 65 | * of the UBI character device should be used. A &struct ubi_rnvol_req object |
66 | * has to be properly filled and a pointer to it has to be passed to the IOCTL. | 66 | * has to be properly filled and a pointer to it has to be passed to the ioctl. |
67 | * | 67 | * |
68 | * UBI volume update | 68 | * UBI volume update |
69 | * ~~~~~~~~~~~~~~~~~ | 69 | * ~~~~~~~~~~~~~~~~~ |
70 | * | 70 | * |
71 | * Volume update should be done via the %UBI_IOCVOLUP IOCTL command of the | 71 | * Volume update should be done via the %UBI_IOCVOLUP ioctl command of the |
72 | * corresponding UBI volume character device. A pointer to a 64-bit update | 72 | * corresponding UBI volume character device. A pointer to a 64-bit update |
73 | * size should be passed to the IOCTL. After this, UBI expects user to write | 73 | * size should be passed to the ioctl. After this, UBI expects user to write |
74 | * this number of bytes to the volume character device. The update is finished | 74 | * this number of bytes to the volume character device. The update is finished |
75 | * when the claimed number of bytes is passed. So, the volume update sequence | 75 | * when the claimed number of bytes is passed. So, the volume update sequence |
76 | * is something like: | 76 | * is something like: |
@@ -80,14 +80,58 @@ | |||
80 | * write(fd, buf, image_size); | 80 | * write(fd, buf, image_size); |
81 | * close(fd); | 81 | * close(fd); |
82 | * | 82 | * |
83 | * Atomic eraseblock change | 83 | * Logical eraseblock erase |
84 | * ~~~~~~~~~~~~~~~~~~~~~~~~ | 84 | * ~~~~~~~~~~~~~~~~~~~~~~~~ |
85 | * | 85 | * |
86 | * Atomic eraseblock change operation is done via the %UBI_IOCEBCH IOCTL | 86 | * To erase a logical eraseblock, the %UBI_IOCEBER ioctl command of the |
87 | * command of the corresponding UBI volume character device. A pointer to | 87 | * corresponding UBI volume character device should be used. This command |
88 | * &struct ubi_leb_change_req has to be passed to the IOCTL. Then the user is | 88 | * unmaps the requested logical eraseblock, makes sure the corresponding |
89 | * expected to write the requested amount of bytes. This is similar to the | 89 | * physical eraseblock is successfully erased, and returns. |
90 | * "volume update" IOCTL. | 90 | * |
91 | * Atomic logical eraseblock change | ||
92 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
93 | * | ||
94 | * Atomic logical eraseblock change operation is called using the %UBI_IOCEBCH | ||
95 | * ioctl command of the corresponding UBI volume character device. A pointer to | ||
96 | * a &struct ubi_leb_change_req object has to be passed to the ioctl. Then the | ||
97 | * user is expected to write the requested amount of bytes (similarly to what | ||
98 | * should be done in case of the "volume update" ioctl). | ||
99 | * | ||
100 | * Logical eraseblock map | ||
101 | * ~~~~~~~~~~~~~~~~~~~~~ | ||
102 | * | ||
103 | * To map a logical eraseblock to a physical eraseblock, the %UBI_IOCEBMAP | ||
104 | * ioctl command should be used. A pointer to a &struct ubi_map_req object is | ||
105 | * expected to be passed. The ioctl maps the requested logical eraseblock to | ||
106 | * a physical eraseblock and returns. Only non-mapped logical eraseblocks can | ||
107 | * be mapped. If the logical eraseblock specified in the request is already | ||
108 | * mapped to a physical eraseblock, the ioctl fails and returns error. | ||
109 | * | ||
110 | * Logical eraseblock unmap | ||
111 | * ~~~~~~~~~~~~~~~~~~~~~~~~ | ||
112 | * | ||
113 | * To unmap a logical eraseblock to a physical eraseblock, the %UBI_IOCEBUNMAP | ||
114 | * ioctl command should be used. The ioctl unmaps the logical eraseblocks, | ||
115 | * schedules corresponding physical eraseblock for erasure, and returns. Unlike | ||
116 | * the "LEB erase" command, it does not wait for the physical eraseblock being | ||
117 | * erased. Note, the side effect of this is that if an unclean reboot happens | ||
118 | * after the unmap ioctl returns, you may find the LEB mapped again to the same | ||
119 | * physical eraseblock after the UBI is run again. | ||
120 | * | ||
121 | * Check if logical eraseblock is mapped | ||
122 | * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
123 | * | ||
124 | * To check if a logical eraseblock is mapped to a physical eraseblock, the | ||
125 | * %UBI_IOCEBISMAP ioctl command should be used. It returns %0 if the LEB is | ||
126 | * not mapped, and %1 if it is mapped. | ||
127 | * | ||
128 | * Set an UBI volume property | ||
129 | * ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
130 | * | ||
131 | * To set an UBI volume property the %UBI_IOCSETPROP ioctl command should be | ||
132 | * used. A pointer to a &struct ubi_set_prop_req object is expected to be | ||
133 | * passed. The object describes which property should be set, and to which value | ||
134 | * it should be set. | ||
91 | */ | 135 | */ |
92 | 136 | ||
93 | /* | 137 | /* |
@@ -101,7 +145,7 @@ | |||
101 | /* Maximum volume name length */ | 145 | /* Maximum volume name length */ |
102 | #define UBI_MAX_VOLUME_NAME 127 | 146 | #define UBI_MAX_VOLUME_NAME 127 |
103 | 147 | ||
104 | /* IOCTL commands of UBI character devices */ | 148 | /* ioctl commands of UBI character devices */ |
105 | 149 | ||
106 | #define UBI_IOC_MAGIC 'o' | 150 | #define UBI_IOC_MAGIC 'o' |
107 | 151 | ||
@@ -114,7 +158,7 @@ | |||
114 | /* Re-name volumes */ | 158 | /* Re-name volumes */ |
115 | #define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req) | 159 | #define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req) |
116 | 160 | ||
117 | /* IOCTL commands of the UBI control character device */ | 161 | /* ioctl commands of the UBI control character device */ |
118 | 162 | ||
119 | #define UBI_CTRL_IOC_MAGIC 'o' | 163 | #define UBI_CTRL_IOC_MAGIC 'o' |
120 | 164 | ||
@@ -123,16 +167,24 @@ | |||
123 | /* Detach an MTD device */ | 167 | /* Detach an MTD device */ |
124 | #define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, int32_t) | 168 | #define UBI_IOCDET _IOW(UBI_CTRL_IOC_MAGIC, 65, int32_t) |
125 | 169 | ||
126 | /* IOCTL commands of UBI volume character devices */ | 170 | /* ioctl commands of UBI volume character devices */ |
127 | 171 | ||
128 | #define UBI_VOL_IOC_MAGIC 'O' | 172 | #define UBI_VOL_IOC_MAGIC 'O' |
129 | 173 | ||
130 | /* Start UBI volume update */ | 174 | /* Start UBI volume update */ |
131 | #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, int64_t) | 175 | #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, int64_t) |
132 | /* An eraseblock erasure command, used for debugging, disabled by default */ | 176 | /* LEB erasure command, used for debugging, disabled by default */ |
133 | #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, int32_t) | 177 | #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, int32_t) |
134 | /* An atomic eraseblock change command */ | 178 | /* Atomic LEB change command */ |
135 | #define UBI_IOCEBCH _IOW(UBI_VOL_IOC_MAGIC, 2, int32_t) | 179 | #define UBI_IOCEBCH _IOW(UBI_VOL_IOC_MAGIC, 2, int32_t) |
180 | /* Map LEB command */ | ||
181 | #define UBI_IOCEBMAP _IOW(UBI_VOL_IOC_MAGIC, 3, struct ubi_map_req) | ||
182 | /* Unmap LEB command */ | ||
183 | #define UBI_IOCEBUNMAP _IOW(UBI_VOL_IOC_MAGIC, 4, int32_t) | ||
184 | /* Check if LEB is mapped command */ | ||
185 | #define UBI_IOCEBISMAP _IOR(UBI_VOL_IOC_MAGIC, 5, int32_t) | ||
186 | /* Set an UBI volume property */ | ||
187 | #define UBI_IOCSETPROP _IOW(UBI_VOL_IOC_MAGIC, 6, struct ubi_set_prop_req) | ||
136 | 188 | ||
137 | /* Maximum MTD device name length supported by UBI */ | 189 | /* Maximum MTD device name length supported by UBI */ |
138 | #define MAX_UBI_MTD_NAME_LEN 127 | 190 | #define MAX_UBI_MTD_NAME_LEN 127 |
@@ -168,6 +220,16 @@ enum { | |||
168 | UBI_STATIC_VOLUME = 4, | 220 | UBI_STATIC_VOLUME = 4, |
169 | }; | 221 | }; |
170 | 222 | ||
223 | /* | ||
224 | * UBI set property ioctl constants | ||
225 | * | ||
226 | * @UBI_PROP_DIRECT_WRITE: allow / disallow user to directly write and | ||
227 | * erase individual eraseblocks on dynamic volumes | ||
228 | */ | ||
229 | enum { | ||
230 | UBI_PROP_DIRECT_WRITE = 1, | ||
231 | }; | ||
232 | |||
171 | /** | 233 | /** |
172 | * struct ubi_attach_req - attach MTD device request. | 234 | * struct ubi_attach_req - attach MTD device request. |
173 | * @ubi_num: UBI device number to create | 235 | * @ubi_num: UBI device number to create |
@@ -305,8 +367,8 @@ struct ubi_rnvol_req { | |||
305 | } __attribute__ ((packed)); | 367 | } __attribute__ ((packed)); |
306 | 368 | ||
307 | /** | 369 | /** |
308 | * struct ubi_leb_change_req - a data structure used in atomic logical | 370 | * struct ubi_leb_change_req - a data structure used in atomic LEB change |
309 | * eraseblock change requests. | 371 | * requests. |
310 | * @lnum: logical eraseblock number to change | 372 | * @lnum: logical eraseblock number to change |
311 | * @bytes: how many bytes will be written to the logical eraseblock | 373 | * @bytes: how many bytes will be written to the logical eraseblock |
312 | * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN) | 374 | * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN) |
@@ -319,4 +381,30 @@ struct ubi_leb_change_req { | |||
319 | int8_t padding[7]; | 381 | int8_t padding[7]; |
320 | } __attribute__ ((packed)); | 382 | } __attribute__ ((packed)); |
321 | 383 | ||
384 | /** | ||
385 | * struct ubi_map_req - a data structure used in map LEB requests. | ||
386 | * @lnum: logical eraseblock number to unmap | ||
387 | * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN) | ||
388 | * @padding: reserved for future, not used, has to be zeroed | ||
389 | */ | ||
390 | struct ubi_map_req { | ||
391 | int32_t lnum; | ||
392 | int8_t dtype; | ||
393 | int8_t padding[3]; | ||
394 | } __attribute__ ((packed)); | ||
395 | |||
396 | |||
397 | /** | ||
398 | * struct ubi_set_prop_req - a data structure used to set an ubi volume | ||
399 | * property. | ||
400 | * @property: property to set (%UBI_PROP_DIRECT_WRITE) | ||
401 | * @padding: reserved for future, not used, has to be zeroed | ||
402 | * @value: value to set | ||
403 | */ | ||
404 | struct ubi_set_prop_req { | ||
405 | uint8_t property; | ||
406 | uint8_t padding[7]; | ||
407 | uint64_t value; | ||
408 | } __attribute__ ((packed)); | ||
409 | |||
322 | #endif /* __UBI_USER_H__ */ | 410 | #endif /* __UBI_USER_H__ */ |
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index f44bb5c77a70..d0a043153cc6 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -182,7 +182,7 @@ static inline int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo) | |||
182 | size = 2048; | 182 | size = 2048; |
183 | if (nr_pcpus >= 32) | 183 | if (nr_pcpus >= 32) |
184 | size = 4096; | 184 | size = 4096; |
185 | if (sizeof(rwlock_t) != 0) { | 185 | if (sizeof(spinlock_t) != 0) { |
186 | #ifdef CONFIG_NUMA | 186 | #ifdef CONFIG_NUMA |
187 | if (size * sizeof(spinlock_t) > PAGE_SIZE) | 187 | if (size * sizeof(spinlock_t) > PAGE_SIZE) |
188 | hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t)); | 188 | hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t)); |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b3bd00a9d992..559422fc0943 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -322,7 +322,6 @@ struct ieee80211_tx_rate { | |||
322 | * @control: union for control data | 322 | * @control: union for control data |
323 | * @status: union for status data | 323 | * @status: union for status data |
324 | * @driver_data: array of driver_data pointers | 324 | * @driver_data: array of driver_data pointers |
325 | * @retry_count: number of retries | ||
326 | * @ampdu_ack_len: number of aggregated frames. | 325 | * @ampdu_ack_len: number of aggregated frames. |
327 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. | 326 | * relevant only if IEEE80211_TX_STATUS_AMPDU was set. |
328 | * @ampdu_ack_map: block ack bit map for the aggregation. | 327 | * @ampdu_ack_map: block ack bit map for the aggregation. |
diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h index b799fb21519a..2fec3c366e81 100644 --- a/include/net/sctp/checksum.h +++ b/include/net/sctp/checksum.h | |||
@@ -79,5 +79,5 @@ static inline __be32 sctp_update_cksum(__u8 *buffer, __u16 length, __be32 crc32) | |||
79 | 79 | ||
80 | static inline __be32 sctp_end_cksum(__be32 crc32) | 80 | static inline __be32 sctp_end_cksum(__be32 crc32) |
81 | { | 81 | { |
82 | return ~crc32; | 82 | return (__force __be32)~cpu_to_le32((__force u32)crc32); |
83 | } | 83 | } |
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h index 83e32f6d7859..9e3182e659db 100644 --- a/include/scsi/libiscsi_tcp.h +++ b/include/scsi/libiscsi_tcp.h | |||
@@ -39,6 +39,7 @@ struct iscsi_segment { | |||
39 | unsigned int total_copied; | 39 | unsigned int total_copied; |
40 | 40 | ||
41 | struct hash_desc *hash; | 41 | struct hash_desc *hash; |
42 | unsigned char padbuf[ISCSI_PAD_LEN]; | ||
42 | unsigned char recv_digest[ISCSI_DIGEST_SIZE]; | 43 | unsigned char recv_digest[ISCSI_DIGEST_SIZE]; |
43 | unsigned char digest[ISCSI_DIGEST_SIZE]; | 44 | unsigned char digest[ISCSI_DIGEST_SIZE]; |
44 | unsigned int digest_len; | 45 | unsigned int digest_len; |
diff --git a/include/sound/hdsp.h b/include/sound/hdsp.h index dec6b1dc37ea..d98a78dff2db 100644 --- a/include/sound/hdsp.h +++ b/include/sound/hdsp.h | |||
@@ -19,6 +19,8 @@ | |||
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/types.h> | ||
23 | |||
22 | #define HDSP_MATRIX_MIXER_SIZE 2048 | 24 | #define HDSP_MATRIX_MIXER_SIZE 2048 |
23 | 25 | ||
24 | enum HDSP_IO_Type { | 26 | enum HDSP_IO_Type { |
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 93a4edb148b5..dfa804958820 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -108,7 +108,7 @@ | |||
108 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ | 108 | #define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \ |
109 | wevent, wflags) \ | 109 | wevent, wflags) \ |
110 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ | 110 | { .id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \ |
111 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1 \ | 111 | .invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \ |
112 | .event = wevent, .event_flags = wflags} | 112 | .event = wevent, .event_flags = wflags} |
113 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ | 113 | #define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \ |
114 | wevent, wflags) \ | 114 | wevent, wflags) \ |
diff --git a/include/video/sisfb.h b/include/video/sisfb.h index e402eb5b3c7a..fdd74f1a6791 100644 --- a/include/video/sisfb.h +++ b/include/video/sisfb.h | |||
@@ -21,8 +21,8 @@ | |||
21 | #ifndef _LINUX_SISFB_H_ | 21 | #ifndef _LINUX_SISFB_H_ |
22 | #define _LINUX_SISFB_H_ | 22 | #define _LINUX_SISFB_H_ |
23 | 23 | ||
24 | #include <linux/types.h> | ||
24 | #include <asm/ioctl.h> | 25 | #include <asm/ioctl.h> |
25 | #include <asm/types.h> | ||
26 | 26 | ||
27 | /**********************************************/ | 27 | /**********************************************/ |
28 | /* PUBLIC */ | 28 | /* PUBLIC */ |
diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h index 95bcef193954..0993a220a3e6 100644 --- a/include/video/uvesafb.h +++ b/include/video/uvesafb.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _UVESAFB_H | 1 | #ifndef _UVESAFB_H |
2 | #define _UVESAFB_H | 2 | #define _UVESAFB_H |
3 | 3 | ||
4 | #include <linux/types.h> | ||
5 | |||
4 | struct v86_regs { | 6 | struct v86_regs { |
5 | __u32 ebx; | 7 | __u32 ebx; |
6 | __u32 ecx; | 8 | __u32 ecx; |