diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-12-16 14:51:32 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-12-16 14:51:32 +0100 |
commit | fe361cfcf40ad4612226347573a8669cd0d44799 (patch) | |
tree | e874ef5a29c3bfe3dd67dc2d8962562c00fc8e3a /arch/sparc/include/asm/hardirq_32.h | |
parent | perf: Optimize ring-buffer write by depending on control dependencies (diff) | |
parent | Linux 3.13-rc4 (diff) | |
download | linux-dev-fe361cfcf40ad4612226347573a8669cd0d44799.tar.xz linux-dev-fe361cfcf40ad4612226347573a8669cd0d44799.zip |
Merge tag 'v3.13-rc4' into perf/core
Merge Linux 3.13-rc4, to refresh this branch with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/include/asm/hardirq_32.h')
-rw-r--r-- | arch/sparc/include/asm/hardirq_32.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h index 162007643cdc..ee93923b7f82 100644 --- a/arch/sparc/include/asm/hardirq_32.h +++ b/arch/sparc/include/asm/hardirq_32.h @@ -7,7 +7,6 @@ #ifndef __SPARC_HARDIRQ_H #define __SPARC_HARDIRQ_H -#define HARDIRQ_BITS 8 #include <asm-generic/hardirq.h> #endif /* __SPARC_HARDIRQ_H */ |