diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /include/asm-h8300 | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'include/asm-h8300')
-rw-r--r-- | include/asm-h8300/hardirq.h | 2 | ||||
-rw-r--r-- | include/asm-h8300/irq.h | 19 | ||||
-rw-r--r-- | include/asm-h8300/uaccess.h | 4 |
3 files changed, 7 insertions, 18 deletions
diff --git a/include/asm-h8300/hardirq.h b/include/asm-h8300/hardirq.h index 18fa7931e09f..9d7f7a7462b2 100644 --- a/include/asm-h8300/hardirq.h +++ b/include/asm-h8300/hardirq.h | |||
@@ -12,6 +12,8 @@ typedef struct { | |||
12 | 12 | ||
13 | #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ | 13 | #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ |
14 | 14 | ||
15 | extern void ack_bad_irq(unsigned int irq); | ||
16 | |||
15 | #define HARDIRQ_BITS 8 | 17 | #define HARDIRQ_BITS 8 |
16 | 18 | ||
17 | /* | 19 | /* |
diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h index 56eec28cc2c4..13d7c601cd0a 100644 --- a/include/asm-h8300/irq.h +++ b/include/asm-h8300/irq.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <asm/ptrace.h> | 4 | #include <asm/ptrace.h> |
5 | 5 | ||
6 | #if defined(__H8300H__) | 6 | #if defined(CONFIG_CPU_H8300H) |
7 | #define NR_IRQS 64 | 7 | #define NR_IRQS 64 |
8 | #define EXT_IRQ0 12 | 8 | #define EXT_IRQ0 12 |
9 | #define EXT_IRQ1 13 | 9 | #define EXT_IRQ1 13 |
@@ -14,14 +14,6 @@ | |||
14 | #define EXT_IRQ6 18 | 14 | #define EXT_IRQ6 18 |
15 | #define EXT_IRQ7 19 | 15 | #define EXT_IRQ7 19 |
16 | #define EXT_IRQS 5 | 16 | #define EXT_IRQS 5 |
17 | |||
18 | #include <asm/regs306x.h> | ||
19 | #define h8300_clear_isr(irq) \ | ||
20 | do { \ | ||
21 | if (irq >= EXT_IRQ0 && irq <= EXT_IRQ5) \ | ||
22 | *(volatile unsigned char *)ISR &= ~(1 << (irq - EXT_IRQ0)); \ | ||
23 | } while(0) | ||
24 | |||
25 | #define IER_REGS *(volatile unsigned char *)IER | 17 | #define IER_REGS *(volatile unsigned char *)IER |
26 | #endif | 18 | #endif |
27 | #if defined(CONFIG_CPU_H8S) | 19 | #if defined(CONFIG_CPU_H8S) |
@@ -44,13 +36,6 @@ do { \ | |||
44 | #define EXT_IRQ15 31 | 36 | #define EXT_IRQ15 31 |
45 | #define EXT_IRQS 15 | 37 | #define EXT_IRQS 15 |
46 | 38 | ||
47 | #include <asm/regs267x.h> | ||
48 | #define h8300_clear_isr(irq) \ | ||
49 | do { \ | ||
50 | if (irq >= EXT_IRQ0 && irq <= EXT_IRQ15) \ | ||
51 | *(volatile unsigned short *)ISR &= ~(1 << (irq - EXT_IRQ0)); \ | ||
52 | } while(0) | ||
53 | |||
54 | #define IER_REGS *(volatile unsigned short *)IER | 39 | #define IER_REGS *(volatile unsigned short *)IER |
55 | #endif | 40 | #endif |
56 | 41 | ||
@@ -59,4 +44,6 @@ static __inline__ int irq_canonicalize(int irq) | |||
59 | return irq; | 44 | return irq; |
60 | } | 45 | } |
61 | 46 | ||
47 | typedef void (*h8300_vector)(void); | ||
48 | |||
62 | #endif /* _H8300_IRQ_H_ */ | 49 | #endif /* _H8300_IRQ_H_ */ |
diff --git a/include/asm-h8300/uaccess.h b/include/asm-h8300/uaccess.h index ebe58c6c8387..a22350ec271a 100644 --- a/include/asm-h8300/uaccess.h +++ b/include/asm-h8300/uaccess.h | |||
@@ -91,7 +91,7 @@ extern int __put_user_bad(void); | |||
91 | #define get_user(x, ptr) \ | 91 | #define get_user(x, ptr) \ |
92 | ({ \ | 92 | ({ \ |
93 | int __gu_err = 0; \ | 93 | int __gu_err = 0; \ |
94 | typeof(*(ptr)) __gu_val = 0; \ | 94 | uint32_t __gu_val = 0; \ |
95 | switch (sizeof(*(ptr))) { \ | 95 | switch (sizeof(*(ptr))) { \ |
96 | case 1: \ | 96 | case 1: \ |
97 | case 2: \ | 97 | case 2: \ |
@@ -106,7 +106,7 @@ extern int __put_user_bad(void); | |||
106 | __gu_err = __get_user_bad(); \ | 106 | __gu_err = __get_user_bad(); \ |
107 | break; \ | 107 | break; \ |
108 | } \ | 108 | } \ |
109 | (x) = __gu_val; \ | 109 | (x) = (typeof(*(ptr)))__gu_val; \ |
110 | __gu_err; \ | 110 | __gu_err; \ |
111 | }) | 111 | }) |
112 | #define __get_user(x, ptr) get_user(x, ptr) | 112 | #define __get_user(x, ptr) get_user(x, ptr) |