diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/cris | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/Kconfig | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/iop_fw_load.c | 6 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/signal.c | 2 | ||||
| -rw-r--r-- | arch/cris/include/asm/atomic.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b17aeea8d620..3462245fe9fb 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -681,6 +681,8 @@ source "drivers/usb/Kconfig" | |||
| 681 | 681 | ||
| 682 | source "drivers/uwb/Kconfig" | 682 | source "drivers/uwb/Kconfig" |
| 683 | 683 | ||
| 684 | source "drivers/staging/Kconfig" | ||
| 685 | |||
| 684 | source "arch/cris/Kconfig.debug" | 686 | source "arch/cris/Kconfig.debug" |
| 685 | 687 | ||
| 686 | source "security/Kconfig" | 688 | source "security/Kconfig" |
diff --git a/arch/cris/arch-v32/drivers/iop_fw_load.c b/arch/cris/arch-v32/drivers/iop_fw_load.c index 3b3857ec1f15..2f8ea0f7a63c 100644 --- a/arch/cris/arch-v32/drivers/iop_fw_load.c +++ b/arch/cris/arch-v32/drivers/iop_fw_load.c | |||
| @@ -24,12 +24,12 @@ | |||
| 24 | #error "Please contact <greg@kroah.com> for details on how to fix it properly." | 24 | #error "Please contact <greg@kroah.com> for details on how to fix it properly." |
| 25 | 25 | ||
| 26 | static struct device iop_spu_device[2] = { | 26 | static struct device iop_spu_device[2] = { |
| 27 | { .bus_id = "iop-spu0", }, | 27 | { .init_name = "iop-spu0", }, |
| 28 | { .bus_id = "iop-spu1", }, | 28 | { .init_name = "iop-spu1", }, |
| 29 | }; | 29 | }; |
| 30 | 30 | ||
| 31 | static struct device iop_mpu_device = { | 31 | static struct device iop_mpu_device = { |
| 32 | .bus_id = "iop-mpu", | 32 | .init_name = "iop-mpu", |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | static int wait_mpu_idle(void) | 35 | static int wait_mpu_idle(void) |
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c index da7d2be000ba..372d0ca6efbc 100644 --- a/arch/cris/arch-v32/kernel/signal.c +++ b/arch/cris/arch-v32/kernel/signal.c | |||
| @@ -456,7 +456,7 @@ give_sigsegv: | |||
| 456 | return -EFAULT; | 456 | return -EFAULT; |
| 457 | } | 457 | } |
| 458 | 458 | ||
| 459 | /* Invoke a singal handler to, well, handle the signal. */ | 459 | /* Invoke a signal handler to, well, handle the signal. */ |
| 460 | static inline int | 460 | static inline int |
| 461 | handle_signal(int canrestart, unsigned long sig, | 461 | handle_signal(int canrestart, unsigned long sig, |
| 462 | siginfo_t *info, struct k_sigaction *ka, | 462 | siginfo_t *info, struct k_sigaction *ka, |
diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h index f71ea686a2ea..5718dd8902a1 100644 --- a/arch/cris/include/asm/atomic.h +++ b/arch/cris/include/asm/atomic.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #define __ASM_CRIS_ATOMIC__ | 4 | #define __ASM_CRIS_ATOMIC__ |
| 5 | 5 | ||
| 6 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
| 7 | 7 | #include <linux/types.h> | |
| 8 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 9 | #include <arch/atomic.h> | 9 | #include <arch/atomic.h> |
| 10 | 10 | ||
| @@ -13,8 +13,6 @@ | |||
| 13 | * resource counting etc.. | 13 | * resource counting etc.. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | typedef struct { volatile int counter; } atomic_t; | ||
| 17 | |||
| 18 | #define ATOMIC_INIT(i) { (i) } | 16 | #define ATOMIC_INIT(i) { (i) } |
| 19 | 17 | ||
| 20 | #define atomic_read(v) ((v)->counter) | 18 | #define atomic_read(v) ((v)->counter) |