Patchwork [v4] linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from recent kernel

login
register
mail settings
Submitter Steffen Sledz
Date Sept. 15, 2011, 7:55 a.m.
Message ID <1316073352-27826-1-git-send-email-sledz@dresearch-fe.de>
Download mbox | patch
Permalink /patch/11445/
State Superseded
Headers show

Comments

Steffen Sledz - Sept. 15, 2011, 7:55 a.m.
Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present
in 2.6.24 headers and was introduced with

  commit 4baa9922430662431231ac637adedddbb0cfb2d7
  Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
  Date:   Sat Aug 2 10:55:55 2008 +0100

      [ARM] move include/asm-arm to arch/arm/include/asm

Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 .../arm-hwcap-add-new-entries.patch                |   26 ++++++++++++++++++++
 .../linux-libc-headers_2.6.24.bb                   |    6 +++-
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
Paul Menzel - Sept. 15, 2011, 9:05 a.m.
Dear Steffen,


unfortunately I still have something to add. :(

Am Donnerstag, den 15.09.2011, 09:55 +0200 schrieb Steffen Sledz:

1. Please do not use `recent` but write the correct version. In this
case it would be 2.6.26 (see below).

> Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present
> in 2.6.24 headers and was introduced with
> 
>   commit 4baa9922430662431231ac637adedddbb0cfb2d7
>   Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
>   Date:   Sat Aug 2 10:55:55 2008 +0100
> 
>       [ARM] move include/asm-arm to arch/arm/include/asm

2. Of course that is not correct and I asked that in my last response
why a move should introduce new code lines.

Using

        git log --follow 4baa9922430662431231ac637adedddbb0cfb2d7 -- arch/arm/include/asm/hwcap.h

I found the following commit

        commit d7f864be8323e5394040e2877594645b0e7da85d
        Author: Catalin Marinas <catalin.marinas@arm.com>
        Date:   Fri Apr 18 22:43:06 2008 +0100
        
            ARMv7: Add support for the ThumbEE state saving/restoring
            
            This patch adds the detection and handling of the ThumbEE extension on
            ARMv7 CPUs.
            
            Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

introduced in 2.6.26.

        $ git describe --contains
        d7f864be8323e5394040e2877594645b0e7da85d
        v2.6.26-rc1~1090^2~27

Please note that this commit contains not only the addition of
HWCAP_THUMBEE to the header but a lot more. So is OpenJDK doing
something incorrectly then? Does it detect the wrong architecture?

> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
>  .../arm-hwcap-add-new-entries.patch                |   26 ++++++++++++++++++++
>  .../linux-libc-headers_2.6.24.bb                   |    6 +++-
>  2 files changed, 30 insertions(+), 2 deletions(-)
>  create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch

[…]

Please update the relevant parts and send it to the list again. You can
commit it the next day if nobody else objects.


Thanks,

Paul


PS: It is hard for reviewers to see what changed in your patch
iterations. For example between v3 and v4. Please add a short note below
the commit message and separate that with an additional `---`. `git am`
will not pick that comment up then.
Steffen Sledz - Sept. 15, 2011, 11:54 a.m.
On 15.09.2011 11:05, Paul Menzel wrote:
> PS: It is hard for reviewers to see what changed in your patch iterations. For example between v3 and v4. Please add a short note below the commit message and separate that with an additional `---`. `git am` will not pick that comment up then.

Is it possible to add such a comment while running "git format-patch" or "git send-email"?

Or is it necessary to mix this into the commit comment itself?
Paul Menzel - Sept. 15, 2011, 2:56 p.m.
Am Donnerstag, den 15.09.2011, 13:54 +0200 schrieb Steffen Sledz:
> On 15.09.2011 11:05, Paul Menzel wrote:
> > PS: It is hard for reviewers to see what changed in your patch iterations. For example between v3 and v4. Please add a short note below the commit message and separate that with an additional `---`. `git am` will not pick that comment up then.
> 
> Is it possible to add such a comment while running "git format-patch" or "git send-email"?

I do not know of a way and I did not find anything in the manual. I
guess you have to edit the mbox file created by `git format-patch` and
then send it.

Other people also use the cover letter feature. But in all cases it
seems to be one step more.

> Or is it necessary to mix this into the commit comment itself?

No, since `git push` is not leaving the comment out.

Thank you again for addressing my comments.


Thanks,

Paul
Steffen Sledz - Sept. 15, 2011, 3:01 p.m.
On 15.09.2011 16:56, Paul Menzel wrote:
> Am Donnerstag, den 15.09.2011, 13:54 +0200 schrieb Steffen Sledz:
>> On 15.09.2011 11:05, Paul Menzel wrote:
>>> PS: It is hard for reviewers to see what changed in your patch iterations. For example between v3 and v4. Please add a short note below the commit message and separate that with an additional `---`. `git am` will not pick that comment up then.
>>
>> Is it possible to add such a comment while running "git format-patch" or "git send-email"?
> 
> I do not know of a way and I did not find anything in the manual. I
> guess you have to edit the mbox file created by `git format-patch` and
> then send it.

After reading the manual i found the --annotate option for "git send-email" which helped me here.

Steffen

Patch

diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
new file mode 100644
index 0000000..c127970
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.24/arm-hwcap-add-new-entries.patch
@@ -0,0 +1,26 @@ 
+linux-libc-headers 2.6.24: backport arm/asm/hwcap.h from recent kernel
+
+Enables building of OpenJDK which uses HWCAP_THUMBEE that is not present
+in 2.6.24 headers and was introduced with
+
+  commit 4baa9922430662431231ac637adedddbb0cfb2d7
+  Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
+  Date:   Sat Aug 2 10:55:55 2008 +0100
+
+      [ARM] move include/asm-arm to arch/arm/include/asm
+
+Upstream-Status: Backport [2.6.27]
+
+Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
+
+diff -Nurd linux-2.6.24.orig//include/asm-arm/hwcap.h linux-2.6.24/include/asm-arm/hwcap.h
+--- linux-2.6.24.orig//include/asm-arm/hwcap.h	2011-09-15 08:42:58.467307245 +0200
++++ linux-2.6.24/include/asm-arm/hwcap.h	2011-09-15 08:43:46.004693497 +0200
+@@ -15,6 +15,7 @@
+ #define HWCAP_JAVA	256
+ #define HWCAP_IWMMXT	512
+ #define HWCAP_CRUNCH	1024
++#define HWCAP_THUMBEE	2048
+ 
+ #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+ /*
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
index 148d03f..d7f67ed 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.24.bb
@@ -2,13 +2,15 @@  require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h \
            file://export_falloc_h.patch \
            file://make-3.82.patch \
-           file://unifdef.patch"
+           file://unifdef.patch \
+           file://arm-hwcap-add-new-entries.patch \
+"
 
 SRC_URI_append_hipox = " \
 	file://siocoutqsnd.patch \