diff options
15 files changed, 1 insertions, 691 deletions
diff --git a/driver-core.current/driver-core-fix-kernel-doc-parameter-name.patch b/driver-core.current/driver-core-fix-kernel-doc-parameter-name.patch deleted file mode 100644 index a5725cb84e5f67..00000000000000 --- a/driver-core.current/driver-core-fix-kernel-doc-parameter-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From randy.dunlap@oracle.com Sun Jan 25 15:22:23 2009 -From: Randy Dunlap <randy.dunlap@oracle.com> -Date: Tue, 20 Jan 2009 16:29:13 -0800 -Subject: driver-core: fix kernel-doc parameter name -To: lkml <linux-kernel@vger.kernel.org> -Cc: gregkh <greg@kroah.com>, Mark McLoughlin <markmc@redhat.com> -Message-ID: <20090120162913.fffe3305.randy.dunlap@oracle.com> - - -From: Randy Dunlap <randy.dunlap@oracle.com> - -Fix function parameter name in kernel-doc: - -Warning(linux-next-20090120//drivers/base/core.c:1289): No description found for parameter 'dev' -Warning(linux-next-20090120//drivers/base/core.c:1289): Excess function parameter 'root' description in 'root_device_unregister' - -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Acked-by: Mark McLoughlin <markmc@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -1280,7 +1280,7 @@ EXPORT_SYMBOL_GPL(__root_device_register - - /** - * root_device_unregister - unregister and free a root device -- * @root: device going away. -+ * @dev: device going away - * - * This function unregisters and cleans up a device that was created by - * root_device_register(). diff --git a/driver-core.current/sync-patch-for-jp_jp-stable_kernel_rules.txt.patch b/driver-core.current/sync-patch-for-jp_jp-stable_kernel_rules.txt.patch deleted file mode 100644 index 9b42673e96c25d..00000000000000 --- a/driver-core.current/sync-patch-for-jp_jp-stable_kernel_rules.txt.patch +++ /dev/null @@ -1,69 +0,0 @@ -From tshibata@ab.jp.nec.com Sat Jan 24 16:23:44 2009 -From: Tsugikazu Shibata <tshibata@ab.jp.nec.com> -Date: Fri, 23 Jan 2009 09:59:50 +0900 (JST) -Subject: Sync patch for jp_JP/stable_kernel_rules.txt -To: greg@kroah.com -Cc: gregkh@suse.de, tshibata@ab.jp.nec.com -Message-ID: <20090123.095950.84381565.tshibata@ab.jp.nec.com> - -From: Tsugikazu Shibata <tshibata@ab.jp.nec.com> - -Updated jp_JP/stable_kernel_rules.txt due to changes in the main version -of the file. - -Also, this patch is already reviewed by Japanese translation community -called JF. - -Signed-off-by: Tsugikazu Shibata <tshibata@ab.jp.nec.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/ja_JP/stable_kernel_rules.txt | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - ---- a/Documentation/ja_JP/stable_kernel_rules.txt -+++ b/Documentation/ja_JP/stable_kernel_rules.txt -@@ -12,11 +12,11 @@ file at first. - - ================================== - これは、 --linux-2.6.24/Documentation/stable_kernel_rules.txt -+linux-2.6.29/Documentation/stable_kernel_rules.txt - の和訳です。 - - 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ > --翻訳日： 2007/12/30 -+翻訳日： 2009/1/14 - 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com> - 校正者： 武井伸光さん、<takei at webmasters dot gr dot jp> - かねこさん (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp> -@@ -38,12 +38,15 @@ 校正者： 武井伸光さん、<takei - - ビルドエラー(CONFIG_BROKENになっているものを除く), oops, ハング、デー - タ破壊、現実のセキュリティ問題、その他 "ああ、これはダメだね"という - ようなものを修正しなければならない。短く言えば、重大な問題。 -+ - 新しい device ID とクオークも受け入れられる。 - - どのように競合状態が発生するかの説明も一緒に書かれていない限り、 - "理論的には競合状態になる"ようなものは不可。 - - いかなる些細な修正も含めることはできない。(スペルの修正、空白のクリー - ンアップなど) -- - 対応するサブシステムメンテナが受け入れたものでなければならない。 - - Documentation/SubmittingPatches の規則に従ったものでなければならない。 -+ - パッチ自体か同等の修正が Linus のツリーに既に存在しなければならない。 -+ Linus のツリーでのコミットID を -stable へのパッチ投稿の際に引用す -+ ること。 - - -stable ツリーにパッチを送付する手続き- - -@@ -52,8 +55,10 @@ 校正者： 武井伸光さん、<takei - - 送信者はパッチがキューに受け付けられた際には ACK を、却下された場合 - には NAK を受け取る。この反応は開発者たちのスケジュールによって、数 - 日かかる場合がある。 -- - もし受け取られたら、パッチは他の開発者たちのレビューのために -- -stable キューに追加される。 -+ - もし受け取られたら、パッチは他の開発者たちと関連するサブシステムの -+ メンテナーによるレビューのために -stable キューに追加される。 -+ - パッチに stable@kernel.org のアドレスが付加されているときには、それ -+ が Linus のツリーに入る時に自動的に stable チームに email される。 - - セキュリティパッチはこのエイリアス (stable@kernel.org) に送られるべ - きではなく、代わりに security@kernel.org のアドレスに送られる。 - diff --git a/driver-core.current/uio-add-missing-documentation-of-features-added-recently.patch b/driver-core.current/uio-add-missing-documentation-of-features-added-recently.patch deleted file mode 100644 index 7ac1fa13dd38f1..00000000000000 --- a/driver-core.current/uio-add-missing-documentation-of-features-added-recently.patch +++ /dev/null @@ -1,139 +0,0 @@ -From hjk@linutronix.de Sun Jan 25 13:31:21 2009 -From: "Hans J. Koch" <hjk@linutronix.de> -Date: Wed, 7 Jan 2009 00:12:37 +0100 -Subject: UIO: Add missing documentation of features added recently -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: linux-kernel@vger.kernel.org, Uwe Kleine-K�nig <ukleinek@strlen.de>, Magnus Damm <damm@igel.co.jp> -Message-ID: <20090106231236.GC3057@local> -Content-Disposition: inline - -From: Hans J. Koch <hjk@linutronix.de> - -The following features were added to the UIO framework in the near past: - -* Generic drivers for platform devices (uio_pdrv, uio_pdrv_genirq) -* an "offset" sysfs attribute for memory mappings - -Unfortunately, all this went in without documentation (won't happen again...) - -This patch updates UIO documentation. - -Signed-off-by: Hans J. Koch <hjk@linutronix.de> -Acked-by: Uwe Kleine-König <ukleinek@strlen.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/DocBook/uio-howto.tmpl | 88 +++++++++++++++++++++++++++++++++++ - 1 file changed, 88 insertions(+) - ---- a/Documentation/DocBook/uio-howto.tmpl -+++ b/Documentation/DocBook/uio-howto.tmpl -@@ -42,6 +42,12 @@ GPL version 2. - - <revhistory> - <revision> -+ <revnumber>0.7</revnumber> -+ <date>2008-12-23</date> -+ <authorinitials>hjk</authorinitials> -+ <revremark>Added generic platform drivers and offset attribute.</revremark> -+ </revision> -+ <revision> - <revnumber>0.6</revnumber> - <date>2008-12-05</date> - <authorinitials>hjk</authorinitials> -@@ -312,6 +318,16 @@ interested in translating it, please ema - pointed to by addr. - </para> - </listitem> -+<listitem> -+ <para> -+ <filename>offset</filename>: The offset, in bytes, that has to be -+ added to the pointer returned by <function>mmap()</function> to get -+ to the actual device memory. This is important if the device's memory -+ is not page aligned. Remember that pointers returned by -+ <function>mmap()</function> are always page aligned, so it is good -+ style to always add this offset. -+ </para> -+</listitem> - </itemizedlist> - - <para> -@@ -594,6 +610,78 @@ framework to set up sysfs files for this - </para> - </sect1> - -+<sect1 id="using_uio_pdrv"> -+<title>Using uio_pdrv for platform devices</title> -+ <para> -+ In many cases, UIO drivers for platform devices can be handled in a -+ generic way. In the same place where you define your -+ <varname>struct platform_device</varname>, you simply also implement -+ your interrupt handler and fill your -+ <varname>struct uio_info</varname>. A pointer to this -+ <varname>struct uio_info</varname> is then used as -+ <varname>platform_data</varname> for your platform device. -+ </para> -+ <para> -+ You also need to set up an array of <varname>struct resource</varname> -+ containing addresses and sizes of your memory mappings. This -+ information is passed to the driver using the -+ <varname>.resource</varname> and <varname>.num_resources</varname> -+ elements of <varname>struct platform_device</varname>. -+ </para> -+ <para> -+ You now have to set the <varname>.name</varname> element of -+ <varname>struct platform_device</varname> to -+ <varname>"uio_pdrv"</varname> to use the generic UIO platform device -+ driver. This driver will fill the <varname>mem[]</varname> array -+ according to the resources given, and register the device. -+ </para> -+ <para> -+ The advantage of this approach is that you only have to edit a file -+ you need to edit anyway. You do not have to create an extra driver. -+ </para> -+</sect1> -+ -+<sect1 id="using_uio_pdrv_genirq"> -+<title>Using uio_pdrv_genirq for platform devices</title> -+ <para> -+ Especially in embedded devices, you frequently find chips where the -+ irq pin is tied to its own dedicated interrupt line. In such cases, -+ where you can be really sure the interrupt is not shared, we can take -+ the concept of <varname>uio_pdrv</varname> one step further and use a -+ generic interrupt handler. That's what -+ <varname>uio_pdrv_genirq</varname> does. -+ </para> -+ <para> -+ The setup for this driver is the same as described above for -+ <varname>uio_pdrv</varname>, except that you do not implement an -+ interrupt handler. The <varname>.handler</varname> element of -+ <varname>struct uio_info</varname> must remain -+ <varname>NULL</varname>. The <varname>.irq_flags</varname> element -+ must not contain <varname>IRQF_SHARED</varname>. -+ </para> -+ <para> -+ You will set the <varname>.name</varname> element of -+ <varname>struct platform_device</varname> to -+ <varname>"uio_pdrv_genirq"</varname> to use this driver. -+ </para> -+ <para> -+ The generic interrupt handler of <varname>uio_pdrv_genirq</varname> -+ will simply disable the interrupt line using -+ <function>disable_irq_nosync()</function>. After doing its work, -+ userspace can reenable the interrupt by writing 0x00000001 to the UIO -+ device file. The driver already implements an -+ <function>irq_control()</function> to make this possible, you must not -+ implement your own. -+ </para> -+ <para> -+ Using <varname>uio_pdrv_genirq</varname> not only saves a few lines of -+ interrupt handler code. You also do not need to know anything about -+ the chip's internal registers to create the kernel part of the driver. -+ All you need to know is the irq number of the pin the chip is -+ connected to. -+ </para> -+</sect1> -+ - </chapter> - - <chapter id="userspace_driver" xreflabel="Writing a driver in user space"> @@ -11,9 +11,6 @@ gregkh.pre/detect-atomic-counter-underflows.patch ################################# # Driver core patches for 2.6.29 ################################# -driver-core.current/sync-patch-for-jp_jp-stable_kernel_rules.txt.patch -driver-core.current/uio-add-missing-documentation-of-features-added-recently.patch -driver-core.current/driver-core-fix-kernel-doc-parameter-name.patch ################################# # USB patches for 2.6.29 @@ -113,16 +110,6 @@ gregkh.post/usb-gotemp.patch # for before .29 is done: -staging/staging-comedi-fix-kbuild.patch -staging/staging-meilhaus-fix-kbuild.patch -staging/staging-android-binder-fix-arm-build-errors.patch -staging/staging-android-timed_gpio-fix-build-to-build-on-kernels-after-2.6.25.patch -staging/staging-android-fix-build-error-on-64bit-boxes.patch -staging/staging-android-add-lowmemorykiller-documentation.patch -staging/staging-android-task_get_unused_fd_flags-fix-the-wrong-usage-of-tsk-signal.patch -staging/staging-agnx-drivers-staging-agnx-agnx.h-needs-linux-io.h.patch -staging/staging-usbip-usbip_start_threads-handle-kernel_thread-failure.patch -staging/staging-poch-fix-verification-of-memory-area.patch # for after .29: diff --git a/staging/staging-agnx-drivers-staging-agnx-agnx.h-needs-linux-io.h.patch b/staging/staging-agnx-drivers-staging-agnx-agnx.h-needs-linux-io.h.patch deleted file mode 100644 index 7352ab55687488..00000000000000 --- a/staging/staging-agnx-drivers-staging-agnx-agnx.h-needs-linux-io.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From geert@linux-m68k.org Wed Jan 21 09:15:36 2009 -From: Geert Uytterhoeven <geert@linux-m68k.org> -Date: Mon, 12 Jan 2009 09:19:42 +0100 (CET) -Subject: staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h> -To: Greg KH <greg@kroah.com> -Message-ID: <Pine.LNX.4.64.0901120918220.30201@anakin> - -On m68k: -drivers/staging/agnx/agnx.h: In function 'agnx_read32': -drivers/staging/agnx/agnx.h:10: error: implicit declaration of function 'ioread32' -drivers/staging/agnx/agnx.h: In function 'agnx_write32': -drivers/staging/agnx/agnx.h:15: error: implicit declaration of function 'iowrite32' -drivers/staging/agnx/sta.c: In function 'get_sta_power': -drivers/staging/agnx/sta.c:94: error: implicit declaration of function 'memcpy_fromio' -drivers/staging/agnx/sta.c: In function 'set_sta_power': -drivers/staging/agnx/sta.c:103: error: implicit declaration of function 'memcpy_toio' - -Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/agnx/agnx.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/staging/agnx/agnx.h -+++ b/drivers/staging/agnx/agnx.h -@@ -1,6 +1,8 @@ - #ifndef AGNX_H_ - #define AGNX_H_ - -+#include <linux/io.h> -+ - #include "xmit.h" - - #define PFX KBUILD_MODNAME ": " diff --git a/staging/staging-android-add-lowmemorykiller-documentation.patch b/staging/staging-android-add-lowmemorykiller-documentation.patch deleted file mode 100644 index fb2e025822e444..00000000000000 --- a/staging/staging-android-add-lowmemorykiller-documentation.patch +++ /dev/null @@ -1,35 +0,0 @@ -From arve@android.com Fri Jan 16 18:13:31 2009 -From: Arve Hj�nnev�g <arve@android.com> -Date: Wed, 14 Jan 2009 16:54:16 -0800 -Subject: Staging: android: Add lowmemorykiller documentation. -To: greg@kroah.com -Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, Pavel Machek <pavel@suse.cz>, Brian Swetland <swetland@google.com>, San Mehat <san@android.com>, Robert Love <rlove@google.com>, linux-kernel@vger.kernel.org, Arve Hj�nnev�g <arve@android.com> -Message-ID: <1231980856-30600-1-git-send-email-arve@android.com> - - -Signed-off-by: Arve Hj�nnev�g <arve@android.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/android/lowmemorykiller.txt | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- /dev/null -+++ b/drivers/staging/android/lowmemorykiller.txt -@@ -0,0 +1,16 @@ -+The lowmemorykiller driver lets user-space specify a set of memory thresholds -+where processes with a range of oom_adj values will get killed. Specify the -+minimum oom_adj values in /sys/module/lowmemorykiller/parameters/adj and the -+number of free pages in /sys/module/lowmemorykiller/parameters/minfree. Both -+files take a comma separated list of numbers in ascending order. -+ -+For example, write "0,8" to /sys/module/lowmemorykiller/parameters/adj and -+"1024,4096" to /sys/module/lowmemorykiller/parameters/minfree to kill processes -+with a oom_adj value of 8 or higher when the free memory drops below 4096 pages -+and kill processes with a oom_adj value of 0 or higher when the free memory -+drops below 1024 pages. -+ -+The driver considers memory used for caches to be free, but if a large -+percentage of the cached memory is locked this can be very inaccurate -+and processes may not get killed until the normal oom killer is triggered. -+ diff --git a/staging/staging-android-binder-fix-arm-build-errors.patch b/staging/staging-android-binder-fix-arm-build-errors.patch deleted file mode 100644 index 2b778f41737c83..00000000000000 --- a/staging/staging-android-binder-fix-arm-build-errors.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4e002ac0126c3637a8a17b1c466cf6e8522f107e Mon Sep 17 00:00:00 2001 -From: Arve Hjønnevåg <arve@android.com> -Date: Thu, 8 Jan 2009 15:28:50 -0800 -Subject: Staging: android: binder: fix arm build errors - -From: Arve Hjønnevåg <arve@android.com> -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/android/binder.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/staging/android/binder.c -+++ b/drivers/staging/android/binder.c -@@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_ar - { - struct binder_proc *proc = vma->vm_private_data; - if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) -- printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot); -+ printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot)); - dump_stack(); - } - static void binder_vma_close(struct vm_area_struct *vma) - { - struct binder_proc *proc = vma->vm_private_data; - if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) -- printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot); -+ printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot)); - proc->vma = NULL; - } - -@@ -2677,7 +2677,7 @@ static int binder_mmap(struct file *filp - vma->vm_end = vma->vm_start + SZ_4M; - - if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE) -- printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot); -+ printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, pgprot_val(vma->vm_page_prot)); - - if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) { - ret = -EPERM; diff --git a/staging/staging-android-fix-build-error-on-64bit-boxes.patch b/staging/staging-android-fix-build-error-on-64bit-boxes.patch deleted file mode 100644 index a0c66c8284a927..00000000000000 --- a/staging/staging-android-fix-build-error-on-64bit-boxes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From foo@baz Wed Jan 28 15:42:43 PST 2009 -Date: Wed, 28 Jan 2009 15:42:43 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Staging: android: fix build error on 64bit boxes - -ktime_t isn't ment to directly access on all arches, so use the proper -conversion functions instead to figure out what time is remaining. - -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Cc: Arve Hjønnevåg <arve@android.com> -Cc: Mike Lockwood <lockwood@android.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/android/timed_gpio.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/staging/android/timed_gpio.c -+++ b/drivers/staging/android/timed_gpio.c -@@ -49,7 +49,8 @@ static ssize_t gpio_enable_show(struct d - - if (hrtimer_active(&gpio_data->timer)) { - ktime_t r = hrtimer_get_remaining(&gpio_data->timer); -- remaining = r.tv.sec * 1000 + r.tv.nsec / 1000000; -+ struct timeval t = ktime_to_timeval(r); -+ remaining = t.tv_sec * 1000 + t.tv_usec; - } else - remaining = 0; - diff --git a/staging/staging-android-task_get_unused_fd_flags-fix-the-wrong-usage-of-tsk-signal.patch b/staging/staging-android-task_get_unused_fd_flags-fix-the-wrong-usage-of-tsk-signal.patch deleted file mode 100644 index 56f73a2afc8188..00000000000000 --- a/staging/staging-android-task_get_unused_fd_flags-fix-the-wrong-usage-of-tsk-signal.patch +++ /dev/null @@ -1,51 +0,0 @@ -From oleg@redhat.com Wed Jan 21 07:43:26 2009 -From: Oleg Nesterov <oleg@redhat.com> -Date: Sun, 18 Jan 2009 18:17:20 +0100 -Subject: Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal -To: arve@android.com, gregkh@suse.de, jrm8005@gmail.com, rlove@google.com, swetland@google.com -Cc: linux-kernel@vger.kernel.org -Message-ID: <20090118171720.GA18374@redhat.com> -Content-Disposition: inline - - -Compile tested. - -task_struct->signal is not protected by RCU, the code is bogus. -Change the code to take ->siglock to pin ->signal. - -Signed-off-by: Oleg Nesterov <oleg@redhat.com> -Cc: Arve Hjønnevåg <arve@android.com> -Cc: Brian Swetland <swetland@google.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/android/binder.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/drivers/staging/android/binder.c -+++ b/drivers/staging/android/binder.c -@@ -319,6 +319,7 @@ int task_get_unused_fd_flags(struct task - int fd, error; - struct fdtable *fdt; - unsigned long rlim_cur; -+ unsigned long irqs; - - if (files == NULL) - return -ESRCH; -@@ -335,12 +336,11 @@ repeat: - * N.B. For clone tasks sharing a files structure, this test - * will limit the total number of files that can be opened. - */ -- rcu_read_lock(); -- if (tsk->signal) -+ rlim_cur = 0; -+ if (lock_task_sighand(tsk, &irqs)) { - rlim_cur = tsk->signal->rlim[RLIMIT_NOFILE].rlim_cur; -- else -- rlim_cur = 0; -- rcu_read_unlock(); -+ unlock_task_sighand(tsk, &irqs); -+ } - if (fd >= rlim_cur) - goto out; - diff --git a/staging/staging-android-timed_gpio-fix-build-to-build-on-kernels-after-2.6.25.patch b/staging/staging-android-timed_gpio-fix-build-to-build-on-kernels-after-2.6.25.patch deleted file mode 100644 index 33cfbac5f5e554..00000000000000 --- a/staging/staging-android-timed_gpio-fix-build-to-build-on-kernels-after-2.6.25.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4e6d7f5bee7b8f7ee2a7fe7b5258b4b54b5d13ce Mon Sep 17 00:00:00 2001 -From: Arve Hjønnevåg <arve@android.com> -Date: Thu, 8 Jan 2009 16:48:46 -0800 -Subject: [PATCH] Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25. - - -From: Arve Hjønnevåg <arve@android.com> -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Cc: Mike Lockwood <lockwood@android.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/android/timed_gpio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/staging/android/timed_gpio.c -+++ b/drivers/staging/android/timed_gpio.c -@@ -18,7 +18,7 @@ - #include <linux/platform_device.h> - #include <linux/hrtimer.h> - #include <linux/err.h> --#include <asm/arch/gpio.h> -+#include <linux/gpio.h> - - #include "timed_gpio.h" - diff --git a/staging/staging-comedi-fix-kbuild.patch b/staging/staging-comedi-fix-kbuild.patch deleted file mode 100644 index 909de0872d42d0..00000000000000 --- a/staging/staging-comedi-fix-kbuild.patch +++ /dev/null @@ -1,27 +0,0 @@ -From foo@baz Fri Jan 16 17:59:15 PST 2009 -Date: Fri, 16 Jan 2009 17:59:15 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Staging: comedi: fix Kbuild - -comedi doesn't like being built into the kernel right now, so force it -to be a module. - -Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/comedi/Kconfig | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/comedi/Kconfig -+++ b/drivers/staging/comedi/Kconfig -@@ -1,6 +1,7 @@ - config COMEDI - tristate "Data Acquision support (comedi)" - default N -+ depends on m - ---help--- - Enable support a wide range of data acquision devices - for Linux. diff --git a/staging/staging-meilhaus-fix-kbuild.patch b/staging/staging-meilhaus-fix-kbuild.patch deleted file mode 100644 index e1bf5b9c8429ff..00000000000000 --- a/staging/staging-meilhaus-fix-kbuild.patch +++ /dev/null @@ -1,117 +0,0 @@ -From foo@baz Fri Jan 16 18:01:57 PST 2009 -Date: Fri, 16 Jan 2009 18:01:57 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Staging: meilhaus: fix Kbuild - -The Meilhaus drivers do not like being built into the kernel right now, -so force them to be a module. - -Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/meilhaus/Kconfig | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - ---- a/drivers/staging/meilhaus/Kconfig -+++ b/drivers/staging/meilhaus/Kconfig -@@ -4,6 +4,7 @@ - - menuconfig MEILHAUS - tristate "Meilhaus support" -+ depends on m - ---help--- - If you have a Meilhaus card, say Y (or M) here. - -@@ -18,7 +19,7 @@ if MEILHAUS - config ME0600 - tristate "Meilhaus ME-600 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-600 family of boards - that do data collection and multipurpose I/O. -@@ -29,7 +30,7 @@ config ME0600 - config ME0900 - tristate "Meilhaus ME-900 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-900 family of boards - that do data collection and multipurpose I/O. -@@ -40,7 +41,7 @@ config ME0900 - config ME1000 - tristate "Meilhaus ME-1000 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-1000 family of boards - that do data collection and multipurpose I/O. -@@ -51,7 +52,7 @@ config ME1000 - config ME1400 - tristate "Meilhaus ME-1400 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-1400 family of boards - that do data collection and multipurpose I/O. -@@ -62,7 +63,7 @@ config ME1400 - config ME1600 - tristate "Meilhaus ME-1600 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-1600 family of boards - that do data collection and multipurpose I/O. -@@ -73,7 +74,7 @@ config ME1600 - config ME4600 - tristate "Meilhaus ME-4600 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-4600 family of boards - that do data collection and multipurpose I/O. -@@ -84,7 +85,7 @@ config ME4600 - config ME6000 - tristate "Meilhaus ME-6000 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-6000 family of boards - that do data collection and multipurpose I/O. -@@ -95,7 +96,7 @@ config ME6000 - config ME8100 - tristate "Meilhaus ME-8100 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-8100 family of boards - that do data collection and multipurpose I/O. -@@ -106,7 +107,7 @@ config ME8100 - config ME8200 - tristate "Meilhaus ME-8200 support" - default n -- depends on PCI -+ depends on PCI && m - help - This driver supports the Meilhaus ME-8200 family of boards - that do data collection and multipurpose I/O. -@@ -117,7 +118,7 @@ config ME8200 - config MEDUMMY - tristate "Meilhaus dummy driver" - default n -- depends on PCI -+ depends on PCI && m - help - This provides a dummy driver for the Meilhaus driver package - diff --git a/staging/staging-poch-fix-verification-of-memory-area.patch b/staging/staging-poch-fix-verification-of-memory-area.patch deleted file mode 100644 index 07c9a8fa2f7264..00000000000000 --- a/staging/staging-poch-fix-verification-of-memory-area.patch +++ /dev/null @@ -1,29 +0,0 @@ -From roel.kluin@gmail.com Wed Jan 28 14:00:58 2009 -From: Roel Kluin <roel.kluin@gmail.com> -Date: Wed, 28 Jan 2009 22:14:17 +0100 -Subject: Staging: poch: fix verification of memory area -To: Greg KH <gregkh@suse.de> -Cc: lkml <linux-kernel@vger.kernel.org> -Message-ID: <4980CAA9.1060301@gmail.com> - - -fix verification of memory area - -Signed-off-by: Roel Kluin <roel.kluin@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/poch/poch.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/staging/poch/poch.c -+++ b/drivers/staging/poch/poch.c -@@ -1026,7 +1026,7 @@ static int poch_ioctl(struct inode *inod - } - break; - case POCH_IOC_GET_COUNTERS: -- if (access_ok(VERIFY_WRITE, argp, sizeof(struct poch_counters))) -+ if (!access_ok(VERIFY_WRITE, argp, sizeof(struct poch_counters))) - return -EFAULT; - - spin_lock_irq(&channel->counters_lock); diff --git a/staging/staging-usbip-usbip_start_threads-handle-kernel_thread-failure.patch b/staging/staging-usbip-usbip_start_threads-handle-kernel_thread-failure.patch deleted file mode 100644 index 4b21b886374332..00000000000000 --- a/staging/staging-usbip-usbip_start_threads-handle-kernel_thread-failure.patch +++ /dev/null @@ -1,43 +0,0 @@ -From roel.kluin@gmail.com Sun Jan 25 14:35:50 2009 -From: Roel Kluin <roel.kluin@gmail.com> -Date: Fri, 19 Dec 2008 23:37:30 +0100 -Subject: Staging: usbip: usbip_start_threads(): handle kernel_thread failure -To: Greg KH <gregkh@suse.de> -Cc: lkml <linux-kernel@vger.kernel.org> -Message-ID: <494C222A.8050507@gmail.com> - - -kernel_thread may fail, notice this. - -Signed-off-by: Roel Kluin <roel.kluin@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/usbip/usbip_common.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - ---- a/drivers/staging/usbip/usbip_common.c -+++ b/drivers/staging/usbip/usbip_common.c -@@ -406,8 +406,20 @@ void usbip_start_threads(struct usbip_de - /* - * threads are invoked per one device (per one connection). - */ -- kernel_thread(usbip_thread, (void *)&ud->tcp_rx, 0); -- kernel_thread(usbip_thread, (void *)&ud->tcp_tx, 0); -+ int retval; -+ -+ retval = kernel_thread(usbip_thread, (void *)&ud->tcp_rx, 0); -+ if (retval < 0) { -+ printk(KERN_ERR "Creating tcp_rx thread for ud %p failed.\n", -+ ud); -+ return; -+ } -+ retval = kernel_thread(usbip_thread, (void *)&ud->tcp_tx, 0); -+ if (retval < 0) { -+ printk(KERN_ERR "Creating tcp_tx thread for ud %p failed.\n", -+ ud); -+ return; -+ } - - /* confirm threads are starting */ - wait_for_completion(&ud->tcp_rx.thread_done); @@ -1 +1 @@ -2.6.29-rc3 +2.6.29-rc3-git2 |