Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, 2014-08-04 at 13:45 -0700, Guenter Roeck wrote: > On Mon, Aug 04, 2014 at 08:49:39PM +0100, Ben Hutchings wrote: > > On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: > > > On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > > > > This is the start of the stable review cycle for the 3.2.62 release. > > > > There are 94 patches in this series, which will be posted as responses > > > > to this one. If anyone has any issues with these being applied, please > > > > let me know. > > > > > > > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > > > > Anything received after that time might be too late. > > > > > > > Build results: > > > total: 111 pass: 105 fail: 6 > > > Failed builds: > > > microblaze:mmu_defconfig > > > microblaze:nommu_defconfig > > > mips:allmodconfig > > > sparc64:allmodconfig > > > xtensa:defconfig > > > xtensa:allmodconfig > > > > > > Qemu tests all passed. > > > > > > This is a significant improvement over the previous versions, where we > > > used > > > to see up to 10 build failures. The previously failing builds for > > > unicore32 > > > and score now pass, as well as alpha:allmodconfig. > > > > Yes, I spent a little while digging out build fixes. > > > > I tried to fix the mips allmodconfig build, but failed - it needs > > d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and > > further changes I couldn't identify. > > > > I was unable to reproduce the sparc64 allmodconfig build failure, which > > is in samples/hidraw - it built for me without warnings or errors. > > Could you give me a bit more detail about the test setup? > > > Nothing special, really - Ubuntu 14.4 (previously 13.10), with gcc 4.6.3 > from kernel.org. > > This seems to be related to patch cbf1ef6 (sparc: use asm-generic version of > types.h). After backporting it, the build passes for me. The backport is > attached in case you want to give it a try. [...] OK, I've queued this up with a comment on how it differs from the upstream version. Ben. -- Ben Hutchings It is easier to change the specification to fit the program than vice versa. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, 2014-08-04 at 13:45 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 08:49:39PM +0100, Ben Hutchings wrote: On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Yes, I spent a little while digging out build fixes. I tried to fix the mips allmodconfig build, but failed - it needs d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and further changes I couldn't identify. I was unable to reproduce the sparc64 allmodconfig build failure, which is in samples/hidraw - it built for me without warnings or errors. Could you give me a bit more detail about the test setup? Nothing special, really - Ubuntu 14.4 (previously 13.10), with gcc 4.6.3 from kernel.org. This seems to be related to patch cbf1ef6 (sparc: use asm-generic version of types.h). After backporting it, the build passes for me. The backport is attached in case you want to give it a try. [...] OK, I've queued this up with a comment on how it differs from the upstream version. Ben. -- Ben Hutchings It is easier to change the specification to fit the program than vice versa. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Wed, 2014-08-06 at 22:25 +0900, Satoru Takeuchi wrote: > At Mon, 4 Aug 2014 10:55:44 -0700, > Guenter Roeck wrote: > > > > On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > > > This is the start of the stable review cycle for the 3.2.62 release. > > > There are 94 patches in this series, which will be posted as responses > > > to this one. If anyone has any issues with these being applied, please > > > let me know. > > > > > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > > > Anything received after that time might be too late. > > > > > Build results: > > total: 111 pass: 105 fail: 6 > > Failed builds: > > microblaze:mmu_defconfig > > microblaze:nommu_defconfig > > mips:allmodconfig > > sparc64:allmodconfig > > xtensa:defconfig > > xtensa:allmodconfig > > > > Qemu tests all passed. > > > > This is a significant improvement over the previous versions, where we used > > to see up to 10 build failures. The previously failing builds for unicore32 > > and score now pass, as well as alpha:allmodconfig. > > > > Note that I rearranged arm builds to improve test coverage. > > > > Details are available at http://server.roeck-us.net:8010/builders. > > > > Guenter > > This kernel passed my test. Thanks for testing! Ben. > - Test Cases: >- Build this kernel. >- Boot this kernel. >- Build the latest mainline kernel with this kernel. > > - Test Tool: >https://github.com/satoru-takeuchi/test-linux-stable > > - Test Result (kernel .config, ktest config and test log): >http://satoru-takeuchi.org/test-linux-stable/results/- datetime>.tar.xz > > - Build Environment: >- OS: Debian Jessy x86_64 >- CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4 >- memory: 8GB > > - Test Target Environment: >- Debian Jessy x86_64 (KVM guest on the Build Environment) >- # of vCPU: 2 >- memory: 2GB > > Thanks, > Satoru -- Ben Hutchings To err is human; to really foul things up requires a computer. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
At Mon, 4 Aug 2014 10:55:44 -0700, Guenter Roeck wrote: > > On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > > This is the start of the stable review cycle for the 3.2.62 release. > > There are 94 patches in this series, which will be posted as responses > > to this one. If anyone has any issues with these being applied, please > > let me know. > > > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > > Anything received after that time might be too late. > > > Build results: > total: 111 pass: 105 fail: 6 > Failed builds: > microblaze:mmu_defconfig > microblaze:nommu_defconfig > mips:allmodconfig > sparc64:allmodconfig > xtensa:defconfig > xtensa:allmodconfig > > Qemu tests all passed. > > This is a significant improvement over the previous versions, where we used > to see up to 10 build failures. The previously failing builds for unicore32 > and score now pass, as well as alpha:allmodconfig. > > Note that I rearranged arm builds to improve test coverage. > > Details are available at http://server.roeck-us.net:8010/builders. > > Guenter This kernel passed my test. - Test Cases: - Build this kernel. - Boot this kernel. - Build the latest mainline kernel with this kernel. - Test Tool: https://github.com/satoru-takeuchi/test-linux-stable - Test Result (kernel .config, ktest config and test log): http://satoru-takeuchi.org/test-linux-stable/results/-.tar.xz - Build Environment: - OS: Debian Jessy x86_64 - CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4 - memory: 8GB - Test Target Environment: - Debian Jessy x86_64 (KVM guest on the Build Environment) - # of vCPU: 2 - memory: 2GB Thanks, Satoru -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
At Mon, 4 Aug 2014 10:55:44 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Note that I rearranged arm builds to improve test coverage. Details are available at http://server.roeck-us.net:8010/builders. Guenter This kernel passed my test. - Test Cases: - Build this kernel. - Boot this kernel. - Build the latest mainline kernel with this kernel. - Test Tool: https://github.com/satoru-takeuchi/test-linux-stable - Test Result (kernel .config, ktest config and test log): http://satoru-takeuchi.org/test-linux-stable/results/version-test datetime.tar.xz - Build Environment: - OS: Debian Jessy x86_64 - CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4 - memory: 8GB - Test Target Environment: - Debian Jessy x86_64 (KVM guest on the Build Environment) - # of vCPU: 2 - memory: 2GB Thanks, Satoru -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Wed, 2014-08-06 at 22:25 +0900, Satoru Takeuchi wrote: At Mon, 4 Aug 2014 10:55:44 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Note that I rearranged arm builds to improve test coverage. Details are available at http://server.roeck-us.net:8010/builders. Guenter This kernel passed my test. Thanks for testing! Ben. - Test Cases: - Build this kernel. - Boot this kernel. - Build the latest mainline kernel with this kernel. - Test Tool: https://github.com/satoru-takeuchi/test-linux-stable - Test Result (kernel .config, ktest config and test log): http://satoru-takeuchi.org/test-linux-stable/results/version-test datetime.tar.xz - Build Environment: - OS: Debian Jessy x86_64 - CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4 - memory: 8GB - Test Target Environment: - Debian Jessy x86_64 (KVM guest on the Build Environment) - # of vCPU: 2 - memory: 2GB Thanks, Satoru -- Ben Hutchings To err is human; to really foul things up requires a computer. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, Aug 04, 2014 at 08:49:39PM +0100, Ben Hutchings wrote: > On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: > > On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > > > This is the start of the stable review cycle for the 3.2.62 release. > > > There are 94 patches in this series, which will be posted as responses > > > to this one. If anyone has any issues with these being applied, please > > > let me know. > > > > > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > > > Anything received after that time might be too late. > > > > > Build results: > > total: 111 pass: 105 fail: 6 > > Failed builds: > > microblaze:mmu_defconfig > > microblaze:nommu_defconfig > > mips:allmodconfig > > sparc64:allmodconfig > > xtensa:defconfig > > xtensa:allmodconfig > > > > Qemu tests all passed. > > > > This is a significant improvement over the previous versions, where we used > > to see up to 10 build failures. The previously failing builds for unicore32 > > and score now pass, as well as alpha:allmodconfig. > > Yes, I spent a little while digging out build fixes. > > I tried to fix the mips allmodconfig build, but failed - it needs > d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and > further changes I couldn't identify. > > I was unable to reproduce the sparc64 allmodconfig build failure, which > is in samples/hidraw - it built for me without warnings or errors. > Could you give me a bit more detail about the test setup? > Nothing special, really - Ubuntu 14.4 (previously 13.10), with gcc 4.6.3 from kernel.org. This seems to be related to patch cbf1ef6 (sparc: use asm-generic version of types.h). After backporting it, the build passes for me. The backport is attached in case you want to give it a try. Guenter --- >From 69d878a92dc4bcec560e070f4f019563fa3af10a Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 31 Mar 2013 07:01:47 + Subject: [PATCH] sparc: use asm-generic version of types.h In sparc headers we use the following pattern: #if defined(__sparc__) && defined(__arch64__) sparc64 specific stuff #else sparc32 specific stuff #endif In types.h this pattern was not followed and here we only checked for __sparc__ for no good reason. It was a left-over from long time ago. I checked other architectures - and most of them do not have any such checks. And all the recently merged versions uses the asm-generic version. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller (cherry picked from commit cbf1ef6b3345d2cc7e62407eec6a6f72a8b1346f) Signed-off-by: Guenter Roeck Conflicts: arch/sparc/include/asm/Kbuild arch/sparc/include/uapi/asm/Kbuild --- arch/sparc/include/asm/Kbuild | 1 + arch/sparc/include/asm/types.h | 23 --- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 arch/sparc/include/asm/types.h diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 2c2e388..39a0b4f 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -21,3 +21,4 @@ generic-y += div64.h generic-y += local64.h generic-y += irq_regs.h generic-y += local.h +generic-y += types.h diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h deleted file mode 100644 index 91e5a03..000 --- a/arch/sparc/include/asm/types.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _SPARC_TYPES_H -#define _SPARC_TYPES_H -/* - * This file is never included by application software unless - * explicitly requested (e.g., via linux/types.h) in which case the - * application is Linux specific so (user-) name space pollution is - * not a major issue. However, for interoperability, libraries still - * need to be careful to avoid a name clashes. - */ - -#if defined(__sparc__) - -#include - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - -#endif /* defined(__sparc__) */ - -#endif /* defined(_SPARC_TYPES_H) */ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: > On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > > This is the start of the stable review cycle for the 3.2.62 release. > > There are 94 patches in this series, which will be posted as responses > > to this one. If anyone has any issues with these being applied, please > > let me know. > > > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > > Anything received after that time might be too late. > > > Build results: > total: 111 pass: 105 fail: 6 > Failed builds: > microblaze:mmu_defconfig > microblaze:nommu_defconfig > mips:allmodconfig > sparc64:allmodconfig > xtensa:defconfig > xtensa:allmodconfig > > Qemu tests all passed. > > This is a significant improvement over the previous versions, where we used > to see up to 10 build failures. The previously failing builds for unicore32 > and score now pass, as well as alpha:allmodconfig. Yes, I spent a little while digging out build fixes. I tried to fix the mips allmodconfig build, but failed - it needs d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and further changes I couldn't identify. I was unable to reproduce the sparc64 allmodconfig build failure, which is in samples/hidraw - it built for me without warnings or errors. Could you give me a bit more detail about the test setup? Ben. > Note that I rearranged arm builds to improve test coverage. > > Details are available at http://server.roeck-us.net:8010/builders. -- Ben Hutchings Tomorrow will be cancelled due to lack of interest. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: > This is the start of the stable review cycle for the 3.2.62 release. > There are 94 patches in this series, which will be posted as responses > to this one. If anyone has any issues with these being applied, please > let me know. > > Responses should be made by Wed Aug 06 17:00:00 UTC 2014. > Anything received after that time might be too late. > Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Note that I rearranged arm builds to improve test coverage. Details are available at http://server.roeck-us.net:8010/builders. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
This is the combined patch for 3.2.62-rc1 relative to 3.2.61. Ben. -- Ben Hutchings Tomorrow will be cancelled due to lack of interest. diff --git a/Makefile b/Makefile index f8b642d..333aabf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 61 -EXTRAVERSION = +SUBLEVEL = 62 +EXTRAVERSION = -rc1 NAME = Saber-toothed Squirrel # *DOCUMENTATION* diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index 56ff965..6365ef2 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -490,6 +490,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) } #endif +#define ioread16be(p) be16_to_cpu(ioread16(p)) +#define ioread32be(p) be32_to_cpu(ioread32(p)) +#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p)) +#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p)) + #define inb_p inb #define inw_p inw #define inl_p inl diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 790ea68..082bd36 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,6 +1,7 @@ config ARM bool default y + select ARCH_SUPPORTS_ATOMIC_RMW select HAVE_DMA_API_DEBUG select HAVE_IDE if PCI || ISA || PCMCIA select HAVE_MEMBLOCK diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 650d5923..94b0650 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -14,27 +14,15 @@ .text .align 5 - .word 0 - -1: subs r2, r2, #4 @ 1 do we have enough - blt 5f @ 1 bytes to align with? - cmp r3, #2 @ 1 - strltb r1, [r0], #1 @ 1 - strleb r1, [r0], #1 @ 1 - strb r1, [r0], #1 @ 1 - add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) -/* - * The pointer is now aligned and the length is adjusted. Try doing the - * memset again. - */ ENTRY(memset) ands r3, r0, #3 @ 1 unaligned? - bne 1b @ 1 + mov ip, r0 @ preserve r0 as return value + bne 6f @ 1 /* - * we know that the pointer in r0 is aligned to a word boundary. + * we know that the pointer in ip is aligned to a word boundary. */ - orr r1, r1, r1, lsl #8 +1: orr r1, r1, r1, lsl #8 orr r1, r1, r1, lsl #16 mov r3, r1 cmp r2, #16 @@ -43,29 +31,28 @@ ENTRY(memset) #if ! CALGN(1)+0 /* - * We need an extra register for this loop - save the return address and - * use the LR + * We need 2 extra registers for this loop - use r8 and the LR */ - str lr, [sp, #-4]! - mov ip, r1 + stmfd sp!, {r8, lr} + mov r8, r1 mov lr, r1 2: subs r2, r2, #64 - stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time. - stmgeia r0!, {r1, r3, ip, lr} - stmgeia r0!, {r1, r3, ip, lr} - stmgeia r0!, {r1, r3, ip, lr} + stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time. + stmgeia ip!, {r1, r3, r8, lr} + stmgeia ip!, {r1, r3, r8, lr} + stmgeia ip!, {r1, r3, r8, lr} bgt 2b - ldmeqfd sp!, {pc} @ Now <64 bytes to go. + ldmeqfd sp!, {r8, pc} @ Now <64 bytes to go. /* * No need to correct the count; we're only testing bits from now on */ tst r2, #32 - stmneia r0!, {r1, r3, ip, lr} - stmneia r0!, {r1, r3, ip, lr} + stmneia ip!, {r1, r3, r8, lr} + stmneia ip!, {r1, r3, r8, lr} tst r2, #16 - stmneia r0!, {r1, r3, ip, lr} - ldr lr, [sp], #4 + stmneia ip!, {r1, r3, r8, lr} + ldmfd sp!, {r8, lr} #else @@ -74,54 +61,63 @@ ENTRY(memset) * whole cache lines at once. */ - stmfd sp!, {r4-r7, lr} + stmfd sp!, {r4-r8, lr} mov r4, r1 mov r5, r1 mov r6, r1 mov r7, r1 - mov ip, r1 + mov r8, r1 mov lr, r1 cmp r2, #96 - tstgt r0, #31 + tstgt ip, #31 ble 3f - and ip, r0, #31 - rsb ip, ip, #32 - sub r2, r2, ip - movs ip, ip, lsl #(32 - 4) - stmcsia r0!, {r4, r5, r6, r7} - stmmiia r0!, {r4, r5} - tst ip, #(1 << 30) - mov ip, r1 - strne r1, [r0], #4 + and r8, ip, #31 + rsb r8, r8, #32 + sub r2, r2, r8 + movs r8, r8, lsl #(32 - 4) + stmcsia ip!, {r4, r5, r6, r7} + stmmiia ip!, {r4, r5} + tst r8, #(1 << 30) + mov r8, r1 + strne r1, [ip], #4 3: subs r2, r2, #64 - stmgeia r0!, {r1, r3-r7, ip, lr} - stmgeia r0!, {r1, r3-r7, ip, lr} + stmgeia ip!, {r1, r3-r8, lr} + stmgeia ip!, {r1, r3-r8, lr} bgt 3b - ldmeqfd sp!, {r4-r7, pc} + ldmeqfd sp!, {r4-r8, pc} tst r2, #32 - stmneia r0!, {r1, r3-r7, ip, lr} + stmneia ip!, {r1, r3-r8, lr} tst r2, #16 - stmneia r0!, {r4-r7} - ldmfd sp!, {r4-r7, lr} + stmneia ip!, {r4-r7} + ldmfd sp!, {r4-r8, lr} #endif 4: tst r2, #8 - stmneia r0!, {r1, r3} + stmneia ip!, {r1, r3} tst r2, #4 - strne r1, [r0], #4 + strne r1, [ip], #4 /* * When we get here, we've got less than 4 bytes to zero. We * may have an unaligned pointer as well. */ 5: tst r2, #2 - strneb r1, [r0], #1 - strneb r1, [r0], #1 + strneb r1, [ip], #1 + strneb r1, [ip], #1 tst r2, #1 - strneb r1, [r0], #1 + strneb r1, [ip], #1 mov pc, lr + +6: subs r2, r2, #4 @ 1 do we have enough + blt 5b @ 1 bytes to align with? + cmp r3, #2 @ 1 + strltb r1, [ip], #1 @ 1 + strleb r1, [ip], #1 @ 1 + strb r1, [ip], #1 @ 1 + add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) + b 1b ENDPROC(memset) diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
[PATCH 3.2 00/94] 3.2.62-rc1 review
This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. A combined patch relative to 3.2.61 will be posted as an additional response to this. A shortlog and diffstat can be found below. Ben. - Alan Stern (1): usb-storage/SCSI: Add broken_fua blacklist flag [b14bf2d0c0358140041d1c1805a674376964d0e0] Alex Deucher (2): drm/radeon/dp: return -EIO for flags not zero case [f6be5e64500abbba44e191e1ca0f3366c7d0291b] drm/radeon: avoid leaking edid data [0ac66effe7fcdee55bda6d5d10d3372c95a41920] Alex Shi (1): include/linux/math64.h: add div64_ul() [c2853c8df57f49620d26f317d7d43347c29bfc2e] Amitkumar Karwar (1): mwifiex: fix Tx timeout issue [d76744a93246eccdca1106037e8ee29debf48277] Andras Kovacs (1): USB: cp210x: add support for Corsair usb dongle [b9326057a3d8447f5d2e74a7b521ccf21add2ec0] Andrey Utkin (1): appletalk: Fix socket referencing in skb [36beddc272c111689f3042bf3d10a64d8a805f93] Axel Lin (2): hwmon: (adm1029) Ensure the fan_div cache is updated in set_fan_div [1035a9e3e9c76b64a860a774f5b867d28d34acc2] hwmon: (amc6821) Fix permissions for temp2_input [df86754b746e9a0ff6f863f690b1c01d408e3cdc] Ben Hutchings (4): Revert "net: ip, ipv6: handle gso skbs in forwarding path" [not needed upstream as it has a complete fix for the bug] Revert "net: ipv4: ip_forward: fix inverted local_df test" [not needed upstream as it has a complete fix for the bug] dns_resolver: Null-terminate the right string [640d7efe4c08f06c4ae5d31b79bd8740e7f6790a] score: Add missing #include [not needed upstream as header is included indirectly] Bernd Wachter (1): usb: option: Add ID for Telewell TW-LTE 4G v2 [3d28bd840b2d3981cd28caf5fe1df38f1344dd60] Bert Vermeulen (1): USB: ftdi_sio: Add extra PID. [5a7fbe7e9ea0b1b9d7ffdba64db1faa3a259164c] Bjørn Mork (1): usb: option: add/modify Olivetti Olicard modems [b0ebef36e93703e59003ad6a1a20227e47714417] Brian King (2): ibmvscsi: Abort init sequence during error recovery [9ee755974bea2f9880e517ec985dc9dede1b3a36] ibmvscsi: Add memory barriers for send / receive [7114aae02742d6b5c5a0d39a41deb61d415d3717] Catalin Marinas (1): mm: kmemleak: avoid false negatives on vmalloc'ed objects [7f88f88f83ed609650a01b18572e605ea50cd163] Dan Carpenter (1): applicom: dereferencing NULL on error path [8bab797c6e5724a43b7666ad70860712365cdb71] Daniel Borkmann (1): net: sctp: fix information leaks in ulpevent layer [8f2e5ae40ec193bc0a0ed99e95315c3eebca84ea] Dave Chinner (2): xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near [76d095388b040229ea1aad7dea45be0cfa20f589] xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near [e3a746f5aab71f2dd0a83116772922fb37ae29d6] David R. Piegdon (1): ARM: OMAP2+: Fix parser-bug in platform muxing code [c021f241f4fab2bb4fc4120a38a828a03dd3f970] David Vrabel (1): xen/manage: fix potential deadlock when resuming the console [1b6478231c6f5f844185acb32045cf195028cfce] Dingtianhong (1): igmp: fix the problem when mc leave group [52ad353a5344f1f700c5b777175bdfa41d3cd65a] Emmanuel Grumbach (1): iwlwifi: dvm: don't enable CTS to self [43d826ca5979927131685cc2092c7ce862cb91cd] Eric Dumazet (1): ipv4: fix buffer overflow in ip_options_compile() [10ec9472f05b45c94db3c854d22581a20b97db41] Eric Sandeen (1): ext4: disable synchronous transaction batching if max_batch_time==0 [5dd214248f94d430d70e9230bda72f2654ac88a8] Feng Tang (2): ACPI / EC: Add more debug info and trivial code cleanup [b76b51ba0cef13980813373a548a12206e3cd3c9] ACPI / EC: Don't count a SCI interrupt as a false one [a3cd8d2789c2e265e09377f260e7d2ac9cec81bb] Fengguang Wu (1): unicore32: select generic atomic64_t support [82e54a6aaf8aec971fb16afa3a4404e238a1b98b] Gavin Guo (1): usb: Check if port status is equal to RxDetect [bb86cf569bbd7ad4dce581a37c7fbd748057e9dc] Gu Zheng (1): cpuset,mempolicy: fix sleeping function called from invalid context [391acf970d21219a2a5446282d3b20eace0c0d7a] Guan Xuetao (1): unicore32: add ioremap_nocache definition [a50e4213e71adc7dde0d514aabd8af7275fee39f] Guenter Roeck (3): hwmon: (adm1031) Fix writes to limit registers [145e74a4e505adb84f4e5d4fff7938475c35] hwmon: (adt7470) Fix writes to temperature limit registers
[PATCH 3.2 00/94] 3.2.62-rc1 review
This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. A combined patch relative to 3.2.61 will be posted as an additional response to this. A shortlog and diffstat can be found below. Ben. - Alan Stern (1): usb-storage/SCSI: Add broken_fua blacklist flag [b14bf2d0c0358140041d1c1805a674376964d0e0] Alex Deucher (2): drm/radeon/dp: return -EIO for flags not zero case [f6be5e64500abbba44e191e1ca0f3366c7d0291b] drm/radeon: avoid leaking edid data [0ac66effe7fcdee55bda6d5d10d3372c95a41920] Alex Shi (1): include/linux/math64.h: add div64_ul() [c2853c8df57f49620d26f317d7d43347c29bfc2e] Amitkumar Karwar (1): mwifiex: fix Tx timeout issue [d76744a93246eccdca1106037e8ee29debf48277] Andras Kovacs (1): USB: cp210x: add support for Corsair usb dongle [b9326057a3d8447f5d2e74a7b521ccf21add2ec0] Andrey Utkin (1): appletalk: Fix socket referencing in skb [36beddc272c111689f3042bf3d10a64d8a805f93] Axel Lin (2): hwmon: (adm1029) Ensure the fan_div cache is updated in set_fan_div [1035a9e3e9c76b64a860a774f5b867d28d34acc2] hwmon: (amc6821) Fix permissions for temp2_input [df86754b746e9a0ff6f863f690b1c01d408e3cdc] Ben Hutchings (4): Revert net: ip, ipv6: handle gso skbs in forwarding path [not needed upstream as it has a complete fix for the bug] Revert net: ipv4: ip_forward: fix inverted local_df test [not needed upstream as it has a complete fix for the bug] dns_resolver: Null-terminate the right string [640d7efe4c08f06c4ae5d31b79bd8740e7f6790a] score: Add missing #include linux/export.h [not needed upstream as header is included indirectly] Bernd Wachter (1): usb: option: Add ID for Telewell TW-LTE 4G v2 [3d28bd840b2d3981cd28caf5fe1df38f1344dd60] Bert Vermeulen (1): USB: ftdi_sio: Add extra PID. [5a7fbe7e9ea0b1b9d7ffdba64db1faa3a259164c] Bjørn Mork (1): usb: option: add/modify Olivetti Olicard modems [b0ebef36e93703e59003ad6a1a20227e47714417] Brian King (2): ibmvscsi: Abort init sequence during error recovery [9ee755974bea2f9880e517ec985dc9dede1b3a36] ibmvscsi: Add memory barriers for send / receive [7114aae02742d6b5c5a0d39a41deb61d415d3717] Catalin Marinas (1): mm: kmemleak: avoid false negatives on vmalloc'ed objects [7f88f88f83ed609650a01b18572e605ea50cd163] Dan Carpenter (1): applicom: dereferencing NULL on error path [8bab797c6e5724a43b7666ad70860712365cdb71] Daniel Borkmann (1): net: sctp: fix information leaks in ulpevent layer [8f2e5ae40ec193bc0a0ed99e95315c3eebca84ea] Dave Chinner (2): xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near [76d095388b040229ea1aad7dea45be0cfa20f589] xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near [e3a746f5aab71f2dd0a83116772922fb37ae29d6] David R. Piegdon (1): ARM: OMAP2+: Fix parser-bug in platform muxing code [c021f241f4fab2bb4fc4120a38a828a03dd3f970] David Vrabel (1): xen/manage: fix potential deadlock when resuming the console [1b6478231c6f5f844185acb32045cf195028cfce] Dingtianhong (1): igmp: fix the problem when mc leave group [52ad353a5344f1f700c5b777175bdfa41d3cd65a] Emmanuel Grumbach (1): iwlwifi: dvm: don't enable CTS to self [43d826ca5979927131685cc2092c7ce862cb91cd] Eric Dumazet (1): ipv4: fix buffer overflow in ip_options_compile() [10ec9472f05b45c94db3c854d22581a20b97db41] Eric Sandeen (1): ext4: disable synchronous transaction batching if max_batch_time==0 [5dd214248f94d430d70e9230bda72f2654ac88a8] Feng Tang (2): ACPI / EC: Add more debug info and trivial code cleanup [b76b51ba0cef13980813373a548a12206e3cd3c9] ACPI / EC: Don't count a SCI interrupt as a false one [a3cd8d2789c2e265e09377f260e7d2ac9cec81bb] Fengguang Wu (1): unicore32: select generic atomic64_t support [82e54a6aaf8aec971fb16afa3a4404e238a1b98b] Gavin Guo (1): usb: Check if port status is equal to RxDetect [bb86cf569bbd7ad4dce581a37c7fbd748057e9dc] Gu Zheng (1): cpuset,mempolicy: fix sleeping function called from invalid context [391acf970d21219a2a5446282d3b20eace0c0d7a] Guan Xuetao (1): unicore32: add ioremap_nocache definition [a50e4213e71adc7dde0d514aabd8af7275fee39f] Guenter Roeck (3): hwmon: (adm1031) Fix writes to limit registers [145e74a4e505adb84f4e5d4fff7938475c35] hwmon: (adt7470) Fix writes to temperature limit
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
This is the combined patch for 3.2.62-rc1 relative to 3.2.61. Ben. -- Ben Hutchings Tomorrow will be cancelled due to lack of interest. diff --git a/Makefile b/Makefile index f8b642d..333aabf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 2 -SUBLEVEL = 61 -EXTRAVERSION = +SUBLEVEL = 62 +EXTRAVERSION = -rc1 NAME = Saber-toothed Squirrel # *DOCUMENTATION* diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index 56ff965..6365ef2 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h @@ -490,6 +490,11 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) } #endif +#define ioread16be(p) be16_to_cpu(ioread16(p)) +#define ioread32be(p) be32_to_cpu(ioread32(p)) +#define iowrite16be(v,p) iowrite16(cpu_to_be16(v), (p)) +#define iowrite32be(v,p) iowrite32(cpu_to_be32(v), (p)) + #define inb_p inb #define inw_p inw #define inl_p inl diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 790ea68..082bd36 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1,6 +1,7 @@ config ARM bool default y + select ARCH_SUPPORTS_ATOMIC_RMW select HAVE_DMA_API_DEBUG select HAVE_IDE if PCI || ISA || PCMCIA select HAVE_MEMBLOCK diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 650d5923..94b0650 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -14,27 +14,15 @@ .text .align 5 - .word 0 - -1: subs r2, r2, #4 @ 1 do we have enough - blt 5f @ 1 bytes to align with? - cmp r3, #2 @ 1 - strltb r1, [r0], #1 @ 1 - strleb r1, [r0], #1 @ 1 - strb r1, [r0], #1 @ 1 - add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) -/* - * The pointer is now aligned and the length is adjusted. Try doing the - * memset again. - */ ENTRY(memset) ands r3, r0, #3 @ 1 unaligned? - bne 1b @ 1 + mov ip, r0 @ preserve r0 as return value + bne 6f @ 1 /* - * we know that the pointer in r0 is aligned to a word boundary. + * we know that the pointer in ip is aligned to a word boundary. */ - orr r1, r1, r1, lsl #8 +1: orr r1, r1, r1, lsl #8 orr r1, r1, r1, lsl #16 mov r3, r1 cmp r2, #16 @@ -43,29 +31,28 @@ ENTRY(memset) #if ! CALGN(1)+0 /* - * We need an extra register for this loop - save the return address and - * use the LR + * We need 2 extra registers for this loop - use r8 and the LR */ - str lr, [sp, #-4]! - mov ip, r1 + stmfd sp!, {r8, lr} + mov r8, r1 mov lr, r1 2: subs r2, r2, #64 - stmgeia r0!, {r1, r3, ip, lr} @ 64 bytes at a time. - stmgeia r0!, {r1, r3, ip, lr} - stmgeia r0!, {r1, r3, ip, lr} - stmgeia r0!, {r1, r3, ip, lr} + stmgeia ip!, {r1, r3, r8, lr} @ 64 bytes at a time. + stmgeia ip!, {r1, r3, r8, lr} + stmgeia ip!, {r1, r3, r8, lr} + stmgeia ip!, {r1, r3, r8, lr} bgt 2b - ldmeqfd sp!, {pc} @ Now 64 bytes to go. + ldmeqfd sp!, {r8, pc} @ Now 64 bytes to go. /* * No need to correct the count; we're only testing bits from now on */ tst r2, #32 - stmneia r0!, {r1, r3, ip, lr} - stmneia r0!, {r1, r3, ip, lr} + stmneia ip!, {r1, r3, r8, lr} + stmneia ip!, {r1, r3, r8, lr} tst r2, #16 - stmneia r0!, {r1, r3, ip, lr} - ldr lr, [sp], #4 + stmneia ip!, {r1, r3, r8, lr} + ldmfd sp!, {r8, lr} #else @@ -74,54 +61,63 @@ ENTRY(memset) * whole cache lines at once. */ - stmfd sp!, {r4-r7, lr} + stmfd sp!, {r4-r8, lr} mov r4, r1 mov r5, r1 mov r6, r1 mov r7, r1 - mov ip, r1 + mov r8, r1 mov lr, r1 cmp r2, #96 - tstgt r0, #31 + tstgt ip, #31 ble 3f - and ip, r0, #31 - rsb ip, ip, #32 - sub r2, r2, ip - movs ip, ip, lsl #(32 - 4) - stmcsia r0!, {r4, r5, r6, r7} - stmmiia r0!, {r4, r5} - tst ip, #(1 30) - mov ip, r1 - strne r1, [r0], #4 + and r8, ip, #31 + rsb r8, r8, #32 + sub r2, r2, r8 + movs r8, r8, lsl #(32 - 4) + stmcsia ip!, {r4, r5, r6, r7} + stmmiia ip!, {r4, r5} + tst r8, #(1 30) + mov r8, r1 + strne r1, [ip], #4 3: subs r2, r2, #64 - stmgeia r0!, {r1, r3-r7, ip, lr} - stmgeia r0!, {r1, r3-r7, ip, lr} + stmgeia ip!, {r1, r3-r8, lr} + stmgeia ip!, {r1, r3-r8, lr} bgt 3b - ldmeqfd sp!, {r4-r7, pc} + ldmeqfd sp!, {r4-r8, pc} tst r2, #32 - stmneia r0!, {r1, r3-r7, ip, lr} + stmneia ip!, {r1, r3-r8, lr} tst r2, #16 - stmneia r0!, {r4-r7} - ldmfd sp!, {r4-r7, lr} + stmneia ip!, {r4-r7} + ldmfd sp!, {r4-r8, lr} #endif 4: tst r2, #8 - stmneia r0!, {r1, r3} + stmneia ip!, {r1, r3} tst r2, #4 - strne r1, [r0], #4 + strne r1, [ip], #4 /* * When we get here, we've got less than 4 bytes to zero. We * may have an unaligned pointer as well. */ 5: tst r2, #2 - strneb r1, [r0], #1 - strneb r1, [r0], #1 + strneb r1, [ip], #1 + strneb r1, [ip], #1 tst r2, #1 - strneb r1, [r0], #1 + strneb r1, [ip], #1 mov pc, lr + +6: subs r2, r2, #4 @ 1 do we have enough + blt 5b @ 1 bytes to align with? + cmp r3, #2 @ 1 + strltb r1, [ip], #1 @ 1 + strleb r1, [ip], #1 @ 1 + strb r1, [ip], #1 @ 1 + add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) + b 1b ENDPROC(memset) diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Note that I rearranged arm builds to improve test coverage. Details are available at http://server.roeck-us.net:8010/builders. Guenter -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Yes, I spent a little while digging out build fixes. I tried to fix the mips allmodconfig build, but failed - it needs d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and further changes I couldn't identify. I was unable to reproduce the sparc64 allmodconfig build failure, which is in samples/hidraw - it built for me without warnings or errors. Could you give me a bit more detail about the test setup? Ben. Note that I rearranged arm builds to improve test coverage. Details are available at http://server.roeck-us.net:8010/builders. -- Ben Hutchings Tomorrow will be cancelled due to lack of interest. signature.asc Description: This is a digitally signed message part
Re: [PATCH 3.2 00/94] 3.2.62-rc1 review
On Mon, Aug 04, 2014 at 08:49:39PM +0100, Ben Hutchings wrote: On Mon, 2014-08-04 at 10:55 -0700, Guenter Roeck wrote: On Mon, Aug 04, 2014 at 05:48:31PM +0100, Ben Hutchings wrote: This is the start of the stable review cycle for the 3.2.62 release. There are 94 patches in this series, which will be posted as responses to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed Aug 06 17:00:00 UTC 2014. Anything received after that time might be too late. Build results: total: 111 pass: 105 fail: 6 Failed builds: microblaze:mmu_defconfig microblaze:nommu_defconfig mips:allmodconfig sparc64:allmodconfig xtensa:defconfig xtensa:allmodconfig Qemu tests all passed. This is a significant improvement over the previous versions, where we used to see up to 10 build failures. The previously failing builds for unicore32 and score now pass, as well as alpha:allmodconfig. Yes, I spent a little while digging out build fixes. I tried to fix the mips allmodconfig build, but failed - it needs d3ce88431892, but that depends on 20082595d341, bef9ae3d883c, and further changes I couldn't identify. I was unable to reproduce the sparc64 allmodconfig build failure, which is in samples/hidraw - it built for me without warnings or errors. Could you give me a bit more detail about the test setup? Nothing special, really - Ubuntu 14.4 (previously 13.10), with gcc 4.6.3 from kernel.org. This seems to be related to patch cbf1ef6 (sparc: use asm-generic version of types.h). After backporting it, the build passes for me. The backport is attached in case you want to give it a try. Guenter --- From 69d878a92dc4bcec560e070f4f019563fa3af10a Mon Sep 17 00:00:00 2001 From: Sam Ravnborg s...@ravnborg.org Date: Sun, 31 Mar 2013 07:01:47 + Subject: [PATCH] sparc: use asm-generic version of types.h In sparc headers we use the following pattern: #if defined(__sparc__) defined(__arch64__) sparc64 specific stuff #else sparc32 specific stuff #endif In types.h this pattern was not followed and here we only checked for __sparc__ for no good reason. It was a left-over from long time ago. I checked other architectures - and most of them do not have any such checks. And all the recently merged versions uses the asm-generic version. Signed-off-by: Sam Ravnborg s...@ravnborg.org Signed-off-by: David S. Miller da...@davemloft.net (cherry picked from commit cbf1ef6b3345d2cc7e62407eec6a6f72a8b1346f) Signed-off-by: Guenter Roeck li...@roeck-us.net Conflicts: arch/sparc/include/asm/Kbuild arch/sparc/include/uapi/asm/Kbuild --- arch/sparc/include/asm/Kbuild | 1 + arch/sparc/include/asm/types.h | 23 --- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 arch/sparc/include/asm/types.h diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 2c2e388..39a0b4f 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -21,3 +21,4 @@ generic-y += div64.h generic-y += local64.h generic-y += irq_regs.h generic-y += local.h +generic-y += types.h diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h deleted file mode 100644 index 91e5a03..000 --- a/arch/sparc/include/asm/types.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _SPARC_TYPES_H -#define _SPARC_TYPES_H -/* - * This file is never included by application software unless - * explicitly requested (e.g., via linux/types.h) in which case the - * application is Linux specific so (user-) name space pollution is - * not a major issue. However, for interoperability, libraries still - * need to be careful to avoid a name clashes. - */ - -#if defined(__sparc__) - -#include asm-generic/int-ll64.h - -#ifndef __ASSEMBLY__ - -typedef unsigned short umode_t; - -#endif /* __ASSEMBLY__ */ - -#endif /* defined(__sparc__) */ - -#endif /* defined(_SPARC_TYPES_H) */ -- 1.9.1 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/