- update patches for 2.6.32; they apply when using --without grsecurity

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 5742932eda799dc9ba8ac5abdac50369268f2e6a..ca6ce13c5963272236f42807d9423ba12360539a 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,70 +26,6 @@
  /* Enforce in-order execution of data I/O.
   * No distinction between read/write on PPC; use eieio for all three.
   */
---- linux-2.6.20/drivers/media/common/ir-keymaps.c.orig        2007-02-04 19:44:54.000000000 +0100
-+++ linux-2.6.20/drivers/media/common/ir-keymaps.c     2007-02-17 22:22:39.327414970 +0100
-@@ -151,10 +151,6 @@
- 
- IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
- 
--      [ 0x1e ] = KEY_POWER,       // power
--      [ 0x07 ] = KEY_MEDIA,       // source
--      [ 0x1c ] = KEY_SEARCH,      // scan
--
- /* FIXME: duplicate keycodes?
-  *
-  * These four keys seem to share the same GPIO as CH+, CH-, <<< and >>>
-@@ -175,14 +171,10 @@
-  */
- 
-       [ 0x03 ] = KEY_TUNER,       // TV/FM
-+      [ 0x07 ] = KEY_SEARCH,      // scan
-+      [ 0x1c ] = KEY_ZOOM,        // zoom
- 
--      [ 0x00 ] = KEY_RECORD,
--      [ 0x08 ] = KEY_STOP,
--      [ 0x11 ] = KEY_PLAY,
--
--      [ 0x1a ] = KEY_PLAYPAUSE,   // freeze
--      [ 0x19 ] = KEY_ZOOM,        // zoom
--      [ 0x0f ] = KEY_TEXT,        // min
-+      [ 0x1e ] = KEY_POWER,       // power
- 
-       [ 0x01 ] = KEY_1,
-       [ 0x0b ] = KEY_2,
-@@ -195,20 +187,22 @@
-       [ 0x12 ] = KEY_9,
-       [ 0x02 ] = KEY_0,
-       [ 0x10 ] = KEY_LAST,        // +100
--      [ 0x13 ] = KEY_LIST,        // recall
-+      [ 0x13 ] = KEY_LIST,        // loop
- 
--      [ 0x1f ] = KEY_CHANNELUP,   // chn down
--      [ 0x17 ] = KEY_CHANNELDOWN, // chn up
--      [ 0x16 ] = KEY_VOLUMEUP,    // vol down
--      [ 0x14 ] = KEY_VOLUMEDOWN,  // vol up
-+      [ 0x1f ] = KEY_VOLUMEUP,    // vol down
-+      [ 0x17 ] = KEY_VOLUMEDOWN,  // vol up
-+      [ 0x16 ] = KEY_CHANNELUP,   // chn down
-+      [ 0x14 ] = KEY_CHANNELDOWN, // chn up
- 
--      [ 0x04 ] = KEY_KPMINUS,     // <<<
-+      [ 0x00 ] = KEY_MEDIA,       // source
-+      [ 0x18 ] = KEY_MUTE,        // mute/unmute
-+
-+      [ 0x04 ] = KEY_KPMINUS,     // -
-       [ 0x0e ] = KEY_SETUP,       // function
--      [ 0x0c ] = KEY_KPPLUS,      // >>>
-+      [ 0x0c ] = KEY_KPPLUS,      // +
- 
--      [ 0x0d ] = KEY_GOTO,        // mts
--      [ 0x1d ] = KEY_REFRESH,     // reset
--      [ 0x18 ] = KEY_MUTE         // mute/unmute
-+      [ 0x0d ] = KEY_REFRESH,     // reset
-+      [ 0x0f ] = KEY_PLAYPAUSE    // freeze
- };
- 
- EXPORT_SYMBOL_GPL(ir_codes_pixelview);
 --- linux-2.6.27/arch/powerpc/include/asm/suspend.h    2007-07-09 01:32:17.000000000 +0200
 +++ linux-2.6.27/arch/powerpc/include/asm/suspend.h    2007-08-28 23:26:16.629658848 +0200
 @@ -6,4 +6,7 @@
@@ -118,14 +54,4 @@
  
  void restore_processor_state(void)
  {
---- linux-2.6.31/scripts/Makefile.lib~ 2009-09-15 23:40:30.552124999 +0200
-+++ linux-2.6.31/scripts/Makefile.lib  2009-09-15 23:46:05.155641644 +0200
-@@ -208,7 +208,7 @@
- 
- # Bzip2 and LZMA do not include size in file... so we have to fake that;
- # append the size as a 32-bit littleendian number as gzip does.
--size_append = echo -ne $(shell                                                \
-+size_append = /bin/echo -ne $(shell                                           \
- dec_size=0;                                                           \
- for F in $1; do                                                               \
-       fsize=$$(stat -c "%s" $$F);                                     \
+