diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /arch/frv/include | |
parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/frv/include')
-rw-r--r-- | arch/frv/include/asm/gdb-stub.h | 1 | ||||
-rw-r--r-- | arch/frv/include/asm/hardirq.h | 17 | ||||
-rw-r--r-- | arch/frv/include/asm/mman.h | 19 | ||||
-rw-r--r-- | arch/frv/include/asm/perf_event.h (renamed from arch/frv/include/asm/perf_counter.h) | 10 | ||||
-rw-r--r-- | arch/frv/include/asm/unistd.h | 2 |
5 files changed, 11 insertions, 38 deletions
diff --git a/arch/frv/include/asm/gdb-stub.h b/arch/frv/include/asm/gdb-stub.h index 24f9738670b..2da716407ff 100644 --- a/arch/frv/include/asm/gdb-stub.h +++ b/arch/frv/include/asm/gdb-stub.h | |||
@@ -90,7 +90,6 @@ extern void gdbstub_do_rx(void); | |||
90 | extern asmlinkage void __debug_stub_init_break(void); | 90 | extern asmlinkage void __debug_stub_init_break(void); |
91 | extern asmlinkage void __break_hijack_kernel_event(void); | 91 | extern asmlinkage void __break_hijack_kernel_event(void); |
92 | extern asmlinkage void __break_hijack_kernel_event_breaks_here(void); | 92 | extern asmlinkage void __break_hijack_kernel_event_breaks_here(void); |
93 | extern asmlinkage void start_kernel(void); | ||
94 | 93 | ||
95 | extern asmlinkage void gdbstub_rx_handler(void); | 94 | extern asmlinkage void gdbstub_rx_handler(void); |
96 | extern asmlinkage void gdbstub_rx_irq(void); | 95 | extern asmlinkage void gdbstub_rx_irq(void); |
diff --git a/arch/frv/include/asm/hardirq.h b/arch/frv/include/asm/hardirq.h index fc47515822a..5fc8b6f5bc5 100644 --- a/arch/frv/include/asm/hardirq.h +++ b/arch/frv/include/asm/hardirq.h | |||
@@ -12,24 +12,15 @@ | |||
12 | #ifndef __ASM_HARDIRQ_H | 12 | #ifndef __ASM_HARDIRQ_H |
13 | #define __ASM_HARDIRQ_H | 13 | #define __ASM_HARDIRQ_H |
14 | 14 | ||
15 | #include <linux/threads.h> | 15 | #include <asm/atomic.h> |
16 | #include <linux/irq.h> | ||
17 | |||
18 | typedef struct { | ||
19 | unsigned int __softirq_pending; | ||
20 | unsigned long idle_timestamp; | ||
21 | } ____cacheline_aligned irq_cpustat_t; | ||
22 | |||
23 | #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ | ||
24 | |||
25 | #ifdef CONFIG_SMP | ||
26 | #error SMP not available on FR-V | ||
27 | #endif /* CONFIG_SMP */ | ||
28 | 16 | ||
29 | extern atomic_t irq_err_count; | 17 | extern atomic_t irq_err_count; |
30 | static inline void ack_bad_irq(int irq) | 18 | static inline void ack_bad_irq(int irq) |
31 | { | 19 | { |
32 | atomic_inc(&irq_err_count); | 20 | atomic_inc(&irq_err_count); |
33 | } | 21 | } |
22 | #define ack_bad_irq ack_bad_irq | ||
23 | |||
24 | #include <asm-generic/hardirq.h> | ||
34 | 25 | ||
35 | #endif | 26 | #endif |
diff --git a/arch/frv/include/asm/mman.h b/arch/frv/include/asm/mman.h index 58c1d11e2ac..8eebf89f5ab 100644 --- a/arch/frv/include/asm/mman.h +++ b/arch/frv/include/asm/mman.h | |||
@@ -1,18 +1 @@ | |||
1 | #ifndef __ASM_MMAN_H__ | #include <asm-generic/mman.h> | |
2 | #define __ASM_MMAN_H__ | ||
3 | |||
4 | #include <asm-generic/mman-common.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 /* __ASM_MMAN_H__ */ | ||
18 | |||
diff --git a/arch/frv/include/asm/perf_counter.h b/arch/frv/include/asm/perf_event.h index ccf726e61b2..a69e0155d14 100644 --- a/arch/frv/include/asm/perf_counter.h +++ b/arch/frv/include/asm/perf_event.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* FRV performance counter support | 1 | /* FRV performance event support |
2 | * | 2 | * |
3 | * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2009 Red Hat, Inc. All Rights Reserved. |
4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Written by David Howells (dhowells@redhat.com) |
@@ -9,9 +9,9 @@ | |||
9 | * 2 of the Licence, or (at your option) any later version. | 9 | * 2 of the Licence, or (at your option) any later version. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #ifndef _ASM_PERF_COUNTER_H | 12 | #ifndef _ASM_PERF_EVENT_H |
13 | #define _ASM_PERF_COUNTER_H | 13 | #define _ASM_PERF_EVENT_H |
14 | 14 | ||
15 | #define PERF_COUNTER_INDEX_OFFSET 0 | 15 | #define PERF_EVENT_INDEX_OFFSET 0 |
16 | 16 | ||
17 | #endif /* _ASM_PERF_COUNTER_H */ | 17 | #endif /* _ASM_PERF_EVENT_H */ |
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index 4a8fb427ce0..be6ef0f5cd4 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h | |||
@@ -342,7 +342,7 @@ | |||
342 | #define __NR_preadv 333 | 342 | #define __NR_preadv 333 |
343 | #define __NR_pwritev 334 | 343 | #define __NR_pwritev 334 |
344 | #define __NR_rt_tgsigqueueinfo 335 | 344 | #define __NR_rt_tgsigqueueinfo 335 |
345 | #define __NR_perf_counter_open 336 | 345 | #define __NR_perf_event_open 336 |
346 | 346 | ||
347 | #ifdef __KERNEL__ | 347 | #ifdef __KERNEL__ |
348 | 348 | ||