[oe-commits] Koen Kooi : linux-omap4 2.6.35.3: backport fixes from L24. 13 kernel in meta-texasinstruments
git version control
git at git.openembedded.org
Fri Jun 3 21:04:23 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5348fa080f2629f64085e1b095b00c5138fc6918
URL: http://git.openembedded.org/?p=openembedded.git&a=commit;h=5348fa080f2629f64085e1b095b00c5138fc6918
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Jun 3 14:26:37 2011 +0200
linux-omap4 2.6.35.3: backport fixes from L24.13 kernel in meta-texasinstruments
Signed-off-by: Koen Kooi <koen at openembedded.org>
---
...001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch | 51 +++++++++++++++++
...create-sys-fs-cgroup-to-mount-cgroupfs-on.patch | 58 ++++++++++++++++++++
recipes/linux/linux-omap4_2.6.35.3.bb | 8 ++-
3 files changed, 114 insertions(+), 3 deletions(-)
diff --git a/recipes/linux/linux-omap4-2.6.35.3/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch b/recipes/linux/linux-omap4-2.6.35.3/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch
new file mode 100644
index 0000000..0f4592e
--- /dev/null
+++ b/recipes/linux/linux-omap4-2.6.35.3/0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch
@@ -0,0 +1,51 @@
+From 1415ec63689ef39bcb24b5095941ec4cc884035c Mon Sep 17 00:00:00 2001
+From: Mikael Pettersson <mikpe at it.uu.se>
+Date: Sun, 15 Aug 2010 10:47:23 +0100
+Subject: [PATCH 1/2] ARM: 6329/1: wire up sys_accept4() on ARM
+
+sys_accept4() was added in kernel 2.6.28, but ARM was not updated
+to include it. The number and types of parameters is such that
+no ARM-specific processing is needed, so wiring up sys_accept4()
+just requires defining __NR_accept4 and adding a direct call in
+the syscall entry table.
+
+Tested with an EABI 2.6.35 kernel and Ulrich Drepper's original
+accept4() test program, modified to define __NR_accept4 for ARM.
+
+Using the updated unistd.h also eliminates a warning then building
+glibc (2.10.2 and newer) about accept4() being unimplemented.
+
+Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+---
+ arch/arm/include/asm/unistd.h | 1 +
+ arch/arm/kernel/calls.S | 1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
+index dd2bf53..d02cfb6 100644
+--- a/arch/arm/include/asm/unistd.h
++++ b/arch/arm/include/asm/unistd.h
+@@ -392,6 +392,7 @@
+ #define __NR_rt_tgsigqueueinfo (__NR_SYSCALL_BASE+363)
+ #define __NR_perf_event_open (__NR_SYSCALL_BASE+364)
+ #define __NR_recvmmsg (__NR_SYSCALL_BASE+365)
++#define __NR_accept4 (__NR_SYSCALL_BASE+366)
+
+ /*
+ * The following SWIs are ARM private.
+diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
+index 37ae301..afeb71f 100644
+--- a/arch/arm/kernel/calls.S
++++ b/arch/arm/kernel/calls.S
+@@ -375,6 +375,7 @@
+ CALL(sys_rt_tgsigqueueinfo)
+ CALL(sys_perf_event_open)
+ /* 365 */ CALL(sys_recvmmsg)
++ CALL(sys_accept4)
+ #ifndef syscalls_counted
+ .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
+ #define syscalls_counted
+--
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap4-2.6.35.3/0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch b/recipes/linux/linux-omap4-2.6.35.3/0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
new file mode 100644
index 0000000..55ec975
--- /dev/null
+++ b/recipes/linux/linux-omap4-2.6.35.3/0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
@@ -0,0 +1,58 @@
+From 64bc6f1bfac43096d0102be252392f31405273ec Mon Sep 17 00:00:00 2001
+From: Greg KH <gregkh at suse.de>
+Date: Thu, 5 Aug 2010 13:53:35 -0700
+Subject: [PATCH 2/2] cgroupfs: create /sys/fs/cgroup to mount cgroupfs on
+
+We really shouldn't be asking userspace to create new root filesystems.
+So follow along with all of the other in-kernel filesystems, and provide
+a mount point in sysfs.
+
+For cgroupfs, this should be in /sys/fs/cgroup/ This change provides
+that mount point when the cgroup filesystem is registered in the kernel.
+
+Acked-by: Paul Menage <menage at google.com>
+Acked-by: Dhaval Giani <dhaval.giani at gmail.com>
+Cc: Li Zefan <lizf at cn.fujitsu.com>
+Cc: Lennart Poettering <lennart at poettering.net>
+Cc: Kay Sievers <kay.sievers at vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ kernel/cgroup.c | 13 ++++++++++++-
+ 1 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index 7a14a97..cd81c18 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -1621,6 +1621,8 @@ static struct file_system_type cgroup_fs_type = {
+ .kill_sb = cgroup_kill_sb,
+ };
+
++static struct kobject *cgroup_kobj;
++
+ static inline struct cgroup *__d_cgrp(struct dentry *dentry)
+ {
+ return dentry->d_fsdata;
+@@ -3885,9 +3887,18 @@ int __init cgroup_init(void)
+ hhead = css_set_hash(init_css_set.subsys);
+ hlist_add_head(&init_css_set.hlist, hhead);
+ BUG_ON(!init_root_id(&rootnode));
++
++ cgroup_kobj = kobject_create_and_add("cgroup", fs_kobj);
++ if (!cgroup_kobj) {
++ err = -ENOMEM;
++ goto out;
++ }
++
+ err = register_filesystem(&cgroup_fs_type);
+- if (err < 0)
++ if (err < 0) {
++ kobject_put(cgroup_kobj);
+ goto out;
++ }
+
+ proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations);
+
+--
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap4_2.6.35.3.bb b/recipes/linux/linux-omap4_2.6.35.3.bb
index eecbc6d..e4bab13 100644
--- a/recipes/linux/linux-omap4_2.6.35.3.bb
+++ b/recipes/linux/linux-omap4_2.6.35.3.bb
@@ -3,7 +3,7 @@ COMPATIBLE_MACHINE = "omap4430-panda|am45x-evm"
require multi-kernel.inc
# The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc
-MACHINE_KERNEL_PR_append = "b"
+MACHINE_KERNEL_PR_append = "c"
CORTEXA8FIXUP = "no"
@@ -18,8 +18,10 @@ SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-ubuntu.git;protocol
file://0006-ARM-Add-option-to-allow-userspace-access-to-performa.patch \
file://0007-OMAP4-do-not-force-select-options-which-are-not-requ.patch \
file://0008-omap4-pandaboard-add-support-for-DVI-output.patch \
- file://0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch \
- file://0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch \
+ file://0001-UBUNTU-Config-Fix-FTBS-caused-by-new-binutils.patch \
+ file://0002-Add-AFLAGS-for-sleep44xx-to-fix-FTBS.patch \
+ file://0001-ARM-6329-1-wire-up-sys_accept4-on-ARM.patch \
+ file://0002-cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch \
file://defconfig"
S = "${WORKDIR}/git"
More information about the Openembedded-commits
mailing list