diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /arch/score | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
| download | op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.zip op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.tar.gz | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/score')
| -rw-r--r-- | arch/score/Kconfig | 1 | ||||
| -rw-r--r-- | arch/score/include/asm/Kbuild | 2 | ||||
| -rw-r--r-- | arch/score/lib/checksum.S | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 305f7ee..c75d06a 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -2,7 +2,6 @@ menu "Machine selection" config SCORE def_bool y - select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_SHOW select GENERIC_IOMAP select GENERIC_ATOMIC64 diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index fe7471e..146b9d5 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -3,6 +3,8 @@ header-y += generic-y += barrier.h generic-y += clkdev.h +generic-y += hash.h generic-y += trace_clock.h generic-y += xor.h generic-y += preempt.h + diff --git a/arch/score/lib/checksum.S b/arch/score/lib/checksum.S index 706157e..1141f2b 100644 --- a/arch/score/lib/checksum.S +++ b/arch/score/lib/checksum.S @@ -137,7 +137,7 @@ ENTRY(csum_partial) ldi r25, 0 mv r10, r5 cmpi.c r5, 0x8 - blt small_csumcpy /* < 8(singed) bytes to copy */ + blt small_csumcpy /* < 8(signed) bytes to copy */ cmpi.c r5, 0x0 beq out andri.c r25, src, 0x1 /* odd buffer? */ |
