rpms/kernel/devel drm_nouveau_ucode.patch, NONE, 1.1 patch-2.6.33-rc3.bz2.sign, NONE, 1.1 .cvsignore, 1.1151, 1.1152 Makefile, 1.120, 1.121 config-arm, 1.5, 1.6 config-debug, 1.37, 1.38 config-generic, 1.344, 1.345 config-nodebug, 1.49, 1.50 config-powerpc-generic, 1.52, 1.53 config-powerpc32-generic, 1.36, 1.37 config-powerpc64, 1.35, 1.36 config-sparc64-generic, 1.30, 1.31 config-x86-generic, 1.91, 1.92 config-x86_64-generic, 1.97, 1.98 kernel.spec, 1.1884, 1.1885 linux-2.6-debug-nmi-timeout.patch, 1.5, 1.6 linux-2.6-debug-vm-would-have-oomkilled.patch, 1.6, 1.7 linux-2.6-dell-laptop-rfkill-fix.patch, 1.1, 1.2 linux-2.6-driver-level-usb-autosuspend.diff, 1.2, 1.3 linux-2.6-rfkill-all.patch, 1.1, 1.2 linux-2.6-tracehook.patch, 1.10, 1.11 linux-2.6-utrace.patch, 1.120, 1.121 linux-2.6.30-hush-rom-warning.patch, 1.2, 1.3 sources, 1.1110, 1.1111 upstream, 1.1023, 1.1024 linux-2.6-autoload-wmi.patch, 1.1, NONE linux-2.6-defaults-alsa-hda-beep-off.patch, 1.1, NONE linux-2.6-intel-agp-clear-gtt.patch, 1.1, NONE linux-2.6-nfsd4-proots.patch, 1.5, NONE linux-2.6-pci-cacheline-sizing.patch, 1.2, NONE patch-2.6.32.3.bz2.sign, 1.1, NONE via-hwmon-temp-sensor.patch, 1.4, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 11 19:38:50 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25037
Modified Files:
.cvsignore Makefile config-arm config-debug config-generic
config-nodebug config-powerpc-generic config-powerpc32-generic
config-powerpc64 config-sparc64-generic config-x86-generic
config-x86_64-generic kernel.spec
linux-2.6-debug-nmi-timeout.patch
linux-2.6-debug-vm-would-have-oomkilled.patch
linux-2.6-dell-laptop-rfkill-fix.patch
linux-2.6-driver-level-usb-autosuspend.diff
linux-2.6-rfkill-all.patch linux-2.6-tracehook.patch
linux-2.6-utrace.patch linux-2.6.30-hush-rom-warning.patch
sources upstream
Added Files:
drm_nouveau_ucode.patch patch-2.6.33-rc3.bz2.sign
Removed Files:
linux-2.6-autoload-wmi.patch
linux-2.6-defaults-alsa-hda-beep-off.patch
linux-2.6-intel-agp-clear-gtt.patch
linux-2.6-nfsd4-proots.patch
linux-2.6-pci-cacheline-sizing.patch patch-2.6.32.3.bz2.sign
via-hwmon-temp-sensor.patch
Log Message:
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
- Linux 2.6.33-rc3
- utrace: rebased from roland's people page.
- via-hwmon-temp-sensor.patch: upstream.
- linux-2.6-defaults-alsa-hda-beep-off.patch: new config option supercedes.
- readd nouveau ctxprogs as firmware/ like it should be.
- linux-2.6-pci-cacheline-sizing.patch: upstream.
- linux-2.6-intel-agp-clear-gtt.patch: upstream.
- linux-2.6-nfsd4-proots.patch: upstream?
- rebased the rest.
drm_nouveau_ucode.patch:
Makefile | 12
nouveau/nv50.ctxprog.ihex | 100 ++
nouveau/nv50.ctxvals.ihex | 1335 +++++++++++++++++++++++++++++++++
nouveau/nv84.ctxprog.ihex | 91 ++
nouveau/nv84.ctxvals.ihex | 557 +++++++++++++
nouveau/nv86.ctxprog.ihex | 58 +
nouveau/nv86.ctxvals.ihex | 340 ++++++++
nouveau/nv92.ctxprog.ihex | 103 ++
nouveau/nv92.ctxvals.ihex | 1232 ++++++++++++++++++++++++++++++
nouveau/nv94.ctxprog.ihex | 79 +
nouveau/nv94.ctxvals.ihex | 761 +++++++++++++++++++
nouveau/nv96.ctxprog.ihex | 79 +
nouveau/nv96.ctxvals.ihex | 761 +++++++++++++++++++
nouveau/nv98.ctxprog.ihex | 57 +
nouveau/nv98.ctxvals.ihex | 326 ++++++++
nouveau/nva0.ctxprog.ihex | 89 ++
nouveau/nva0.ctxvals.ihex | 1836 ++++++++++++++++++++++++++++++++++++++++++++++
nouveau/nva5.ctxprog.ihex | 77 +
nouveau/nva5.ctxvals.ihex | 772 +++++++++++++++++++
nouveau/nva8.ctxprog.ihex | 75 +
nouveau/nva8.ctxvals.ihex | 475 +++++++++++
nouveau/nvaa.ctxprog.ihex | 79 +
nouveau/nvaa.ctxvals.ihex | 356 ++++++++
nouveau/nvac.ctxprog.ihex | 79 +
nouveau/nvac.ctxvals.ihex | 363 +++++++++
25 files changed, 10091 insertions(+), 1 deletion(-)
--- NEW FILE drm_nouveau_ucode.patch ---
>From d36d3aa4fab90592c27a83d21e86926fd057101b Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at treachery.i.jkkm.org>
Date: Mon, 11 Jan 2010 09:08:41 -0500
Subject: squash nouveau firmware into a single commit
---
firmware/Makefile | 12 +
firmware/nouveau/nv50.ctxprog.ihex | 100 ++
firmware/nouveau/nv50.ctxvals.ihex | 1335 ++++++++++++++++++++++++++
firmware/nouveau/nv84.ctxprog.ihex | 91 ++
firmware/nouveau/nv84.ctxvals.ihex | 557 +++++++++++
firmware/nouveau/nv86.ctxprog.ihex | 58 ++
firmware/nouveau/nv86.ctxvals.ihex | 340 +++++++
firmware/nouveau/nv92.ctxprog.ihex | 103 ++
firmware/nouveau/nv92.ctxvals.ihex | 1232 ++++++++++++++++++++++++
firmware/nouveau/nv94.ctxprog.ihex | 79 ++
firmware/nouveau/nv94.ctxvals.ihex | 761 +++++++++++++++
firmware/nouveau/nv96.ctxprog.ihex | 79 ++
firmware/nouveau/nv96.ctxvals.ihex | 761 +++++++++++++++
firmware/nouveau/nv98.ctxprog.ihex | 57 ++
firmware/nouveau/nv98.ctxvals.ihex | 326 +++++++
firmware/nouveau/nva0.ctxprog.ihex | 89 ++
firmware/nouveau/nva0.ctxvals.ihex | 1836 ++++++++++++++++++++++++++++++++++++
firmware/nouveau/nva5.ctxprog.ihex | 77 ++
firmware/nouveau/nva5.ctxvals.ihex | 772 +++++++++++++++
firmware/nouveau/nva8.ctxprog.ihex | 75 ++
firmware/nouveau/nva8.ctxvals.ihex | 475 ++++++++++
firmware/nouveau/nvaa.ctxprog.ihex | 79 ++
firmware/nouveau/nvaa.ctxvals.ihex | 356 +++++++
firmware/nouveau/nvac.ctxprog.ihex | 79 ++
firmware/nouveau/nvac.ctxvals.ihex | 362 +++++++
25 files changed, 10091 insertions(+), 0 deletions(-)
create mode 100644 firmware/nouveau/nv50.ctxprog.ihex
create mode 100644 firmware/nouveau/nv50.ctxvals.ihex
create mode 100644 firmware/nouveau/nv84.ctxprog.ihex
create mode 100644 firmware/nouveau/nv84.ctxvals.ihex
create mode 100644 firmware/nouveau/nv86.ctxprog.ihex
create mode 100644 firmware/nouveau/nv86.ctxvals.ihex
create mode 100644 firmware/nouveau/nv92.ctxprog.ihex
create mode 100644 firmware/nouveau/nv92.ctxvals.ihex
create mode 100644 firmware/nouveau/nv94.ctxprog.ihex
create mode 100644 firmware/nouveau/nv94.ctxvals.ihex
create mode 100644 firmware/nouveau/nv96.ctxprog.ihex
create mode 100644 firmware/nouveau/nv96.ctxvals.ihex
create mode 100644 firmware/nouveau/nv98.ctxprog.ihex
create mode 100644 firmware/nouveau/nv98.ctxvals.ihex
create mode 100644 firmware/nouveau/nva0.ctxprog.ihex
create mode 100644 firmware/nouveau/nva0.ctxvals.ihex
create mode 100644 firmware/nouveau/nva5.ctxprog.ihex
create mode 100644 firmware/nouveau/nva5.ctxvals.ihex
create mode 100644 firmware/nouveau/nva8.ctxprog.ihex
create mode 100644 firmware/nouveau/nva8.ctxvals.ihex
create mode 100644 firmware/nouveau/nvaa.ctxprog.ihex
create mode 100644 firmware/nouveau/nvaa.ctxvals.ihex
create mode 100644 firmware/nouveau/nvac.ctxprog.ihex
create mode 100644 firmware/nouveau/nvac.ctxvals.ihex
diff --git a/firmware/Makefile b/firmware/Makefile
index 6d5c3ab..f315b2d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -62,6 +62,18 @@ fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
radeon/RV770_pfp.bin radeon/RV770_me.bin \
radeon/RV730_pfp.bin radeon/RV730_me.bin \
radeon/RV710_pfp.bin radeon/RV710_me.bin
+fw-shipped-$(CONFIG_DRM_NOUVEAU) += nouveau/nv50.ctxprog nouveau/nv50.ctxvals \
+ nouveau/nv84.ctxprog nouveau/nv84.ctxvals \
+ nouveau/nv86.ctxprog nouveau/nv86.ctxvals \
+ nouveau/nv92.ctxprog nouveau/nv92.ctxvals \
+ nouveau/nv94.ctxprog nouveau/nv94.ctxvals \
+ nouveau/nv96.ctxprog nouveau/nv96.ctxvals \
+ nouveau/nv98.ctxprog nouveau/nv98.ctxvals \
+ nouveau/nva0.ctxprog nouveau/nva0.ctxvals \
+ nouveau/nva5.ctxprog nouveau/nva5.ctxvals \
+ nouveau/nva8.ctxprog nouveau/nva8.ctxvals \
+ nouveau/nvaa.ctxprog nouveau/nvaa.ctxvals \
+ nouveau/nvac.ctxprog nouveau/nvac.ctxvals
fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
diff --git a/firmware/nouveau/nv50.ctxprog.ihex b/firmware/nouveau/nv50.ctxprog.ihex
new file mode 100644
index 0000000..684781a
--- /dev/null
+++ b/firmware/nouveau/nv50.ctxprog.ihex
@@ -0,0 +1,100 @@
+:100000004E564350008A018E0070009C0070002004
+:10001000002000080060004C005000890E400000E5
+:100020000020000700600000003000FF00C000005A
+:10003000002000FF008000090070004D874100444F
+:100040001E4000051E40000D1E40000663410005D5
+:10005000006000C5154000110060000B1C4000FF4F
+:10006000FF9000FFFF910020002000080060004C7E
+:1000700000500009006000456341004D7E41009D35
+:10008000007000CF2240009F0070009F005000C011
+:100090001F400080002000080060004F1F4000C08B
+:1000A0001F4000CC254000810070000000200006A9
+:1000B00000600000007000FC1B1100830070000055
+:1000C0000030000059210007006000010BC0001C37
+:1000D00000200001008000CB005000FF00C0008025
+:1000E0000070008300700047002000060060000AD6
+:1000F000021100C00520000700600000003000FF72
+:1001000000C000FF00C800076E410027262000FF46
+:100110000080008C454000CB0050003F02A0004012
+:10012000002000060060000F007000020217000AA5
+:10013000021100320020000D02100042021B0002DA
+:1001400003120002041400000518000905130050F2
+:100150000515000506110007061E00000711000026
+:1001600009110002091100000A1100020B160028F3
+:100170000B11002B0B1400010C11000014110005D1
+:1001800014110007141100091411000B141100EAD6
+:10019000002000001510000F6D40004B6D40000066
+:1001A0003721000700600040042000FF0088008F16
+:1001B0000070008C6D4000CB00500000000000F883
+:1001C0001811002B002000051A1000001C13000459
+:1001D0001C1100201C1400251C1100401C1300449D
+:1001E0001C1100601C1400651C1100801C1300848D
+:1001F0001C1100A01C1400A51C1100C01C1300C47D
+:100200001C1100E01C1400E51C1100001D1300046B
+:100210001D1100201D1400251D1100401D13004458
+:100220001D1100601D1400651D1100001F1300400A
+:100230001F1900E0A74000170220000600600044DC
+:1002400000200080201000C6201100C9201500D019
+:100250002019000021120003211200002216000FB5
+:100260009F40004B9F400000372100070060004086
+:10027000042000FF0088008F0070008C9F4000CB9E
+:100280000050000000000007221200802211000030
+:1002900023110002231100802312008B23110094EC
+:1002A000231900E1B94000850220000600600044E7
+:1002B00000200080241000C6241100C9241500D09D
+:1002C000241900002512000325120000261600073D
+:1002D000261200802611000027110002271100803D
+:1002E0002712008B27110094271900E2D54000F354
+:1002F000022000060060004400200080281000C694
+:10030000281100C92815000FC940004BC940000042
+:100310003721000700600040042000FF0088008FA4
+:100320000070008CC94000CB00500000000000D0DD
+:100330002819000029120003291200002A160007BC
+:100340002A1200802A1100002B1100022B110080BC
+:100350002B12008B2B1100942B1900E3E740006156
+:100360000320000600600044002000802C1000C61E
+:100370002C1100C92C1500D02C1900002D120003DF
+:100380002D1200002E1600072E1200802E110000E4
+:100390002F1100022F1100802F12008B2F110094BB
+:1003A0002F1900E4034100CF032000060060004441
+:1003B000002000803010000FF540004BF540000099
+:1003C0003721000700600040042000FF0088008FF4
+:1003D0000070008CF54000CB00500000000000C60B
+:1003E000301100C9301500D030190000311200035F
+:1003F0003112000032160007321200803211000064
+:1004000033110002331100803312008B331100943A
+:10041000331900E51541003D04200006006000444A
+:1004200000200080341000C6341100C9341500D0FB
+:10043000341900003512000335120000361600078B
+:10044000361200803611000037110002371100808B
+:100450003712008B37110094371900E6314100AB99
+:100460000420000600600044002000803810000FC7
+:100470002341004B2341000037210007006000406A
+:10048000042000FF0088008F0070008C234100CB07
+:1004900000500000000000C6381100C9381500D017
+:1004A0003819000039120003391200003A1600070B
+:1004B0003A1200803A1100003B1100023B1100800B
+:1004C0003B12008B3B1100943B1900E7434100199C
+:1004D0000520000600600044002000803C1000C69B
+:1004E0003C1100C93C1500D03C1900003D1200032E
+:1004F0003D1200003E1600073E1200803E11000033
+:100500003F1100023F1100803F12008B3F11009409
+:100510003F1900000000000F4A4100CB00500000CE
+:100520003721000700600040042000FF008800CB56
+:10053000005000874D41000A0060000000000000EC
+:100540005C4100A000700080007000C00520000722
+:1005500000600004002000FF00C000FF008000CB0E
+:10056000005000000070000000200006006000FE47
+:100570001B11004D7E4100000070000000200006AD
+:10058000006000FE1B1100800070001D0070004D17
+:1005900011400081007000040060004A0050008893
+:1005A0006841000B006000000020000600600000B1
+:1005B0000070000B7E4100FD1B11004D37400027ED
+:1005C000262000FD008000CB0050000200C000C0CB
+:1005D000052000070060005F01200002008000CBC2
+:1005E0000050000218C000C824200002008000CB88
+:1005F0000050004D4340000B0060004D7C41000165
+:100600000070000300700006824100058341000D68
+:10061000006000050070000D007000060070000B07
+:0F0620000070000E0070001C0070000C006000E5
+:00000001FF
diff --git a/firmware/nouveau/nv50.ctxvals.ihex b/firmware/nouveau/nv50.ctxvals.ihex
new file mode 100644
index 0000000..9c82e73
--- /dev/null
+++ b/firmware/nouveau/nv50.ctxvals.ihex
@@ -0,0 +1,1335 @@
+:100000004E56435600690A000043000000300000CD
+:100010000048000000400040FF490000008000F060
+:10002000FF4A0000009000F7FF4B000000A806E820
+:10003000FF4C0000000200000075000000030000FB
+:10004000007600000000100000850000000CFE009B
+:10005000008A000000001000009500000087FD01EC
+:10006000009A000000181000009B000000FF000034
[...9907 lines suppressed...]
+:100A500000750700003F000000960700000400003A
+:100A600000A607000001000000A7070000880000A2
+:100A700000AD07000001000000AE070000150000F7
+:100A800000AF07000088000000BD07000001000063
+:100A900000C707000004000000CD070000010000AF
+:100AA00000CE07000080444404E507000001100068
+:100AB0000045080000110000007F0800002600002B
+:100AC00000850800000F000000970800000000806B
+:100AD0003FB70800001A000000BF08000010000027
+:100AE00000C508000011000000FD08000001000022
+:100AF0000005090000010000000D090000010000D0
+:100B00000015090000020000001D0900000100009E
+:100B10000025090000020000002D0900000100006E
+:100B2000003D09000067FE1F004D0900008168AC10
+:100B30000FA609000001000000B609000001000036
+:100B400000D60900008824712AE609000000C0854B
+:100B500040EE09000040000000F60900000001001E
+:100B600000FE09000000010100060A0000000080EC
+:100B700002070A000052000000170A0000260000C9
+:100B800000270A0000040000002D0A0000010000F8
+:100B9000002F0A000004000000350A0000020000D7
+:100BA000003D0A0000010000003F0A00001A00009A
+:100BB00000450A0000010000004D0A00000200008C
+:100BC00000550A000001000000570A000000FFFF66
+:100BD000005D0A000001000000850A00001100000D
+:100BE000008D0A000001000000D60A00000F00007E
+:100BF00000360B0000040000003E0B0000FFFF0069
+:100C000000460B0000FFFF00004E0B0000FFFF003E
+:100C100000560B0000FFFF00009E0B0000010000CB
+:100C200000BE0B000001000000EE0B000001000000
+:100C300000060C0000010000005E0C000001000036
+:100C400000660C0000010000006E0C0000020000B5
+:100C500000760C0000010000007E0C000001000086
+:100C600000860C0000020000008E0C000001000055
+:100C7000009E0C000011000000DE0C00008168AC3A
+:100C80000FF60C000004000000160D00001100001B
+:100C9000001E0D0000010000002E0D0000CF00001E
+:100CA00000360D0000CF0000003E0D0000CF000018
+:100CB000008B0D00000F000000960D0000010000E9
+:100CC000009B0D0000010000009E0D0000010000CF
+:100CD00000A60D000002000000AE0D0000010000A3
+:100CE00000B60D000001000000BE0D000002000073
+:100CF00000C60D000001000000D60D00000100003C
+:100D000000DE0D000001000000E60D000001000003
+:100D100000EE0D000001000000F60D0000010000D3
+:100D200000FE0D000001000000060E0000010000A2
+:100D3000000E0E000001000000160E000011000061
+:100D400000560E00008168AC0F5E0E00000F000020
+:100D5000009E0E000067FE1F00B60E00001100008E
+:100D600000BE0E000001000000DE0E0000040000C6
+:100D7000000E0F000001000000360F0000110000FF
+:100D800000760F00008168AC0F960F000011000084
+:100D9000009E0F000001000000AE0F0000010000E7
+:100DA00000BE0F000001000000CE0F0000FF070092
+:100DB00000DE0F000001000000EE0F000001000047
+:100DC00000731000000F0000004611000008000032
+:100DD000004E11000008000000561100000800003D
+:100DE000005E11000008000000661100000800000D
+:100DF000006E1100000800000076110000080000DD
+:100E0000007E1100000800000086110000110000A3
+:100E100000C61100008168AC0FCE11000000040074
+:100E200000D611000000040000DE110000000400E4
+:100E300000E611000000040000EE110000000400B4
+:100E400000F611000000040000FE11000000040084
+:100E50000006120000000400000E12000000030053
+:100E60000016120000000300001E12000000030024
+:100E70000026120000000300002E120000000300F4
+:100E80000036120000000300003E120000000300C4
+:100E90000046120000000300004E12000001000096
+:100EA00000561200000F0000009612000020000003
+:100EB000009E12000011000000A6120000000100B8
+:100EC00000B612000001000000CE12000040000039
+:100ED00000D612000000010000E61200000300002E
+:100EE000000E13000067FE1F002E1300000200001A
+:100EF00000361300008168AC0F861300000100006B
+:100F000000AE13000004000000BE1300000100004A
+:100F100000C613000000040000CE13000000030010
+:100F200000D613000001100000F6130000110000AD
+:100F300000361400008168AC0F3E1400000F000062
+:100F400000FE1400008168AC0F0615000067FE1F4C
+:100F50000026150000110000003E150000040000EE
+:100F6000004E1500000100000056150000010000B1
+:100F70000076150000010000009E1500008168AC9D
+:100F80000FC615000004000000D615000001000087
+:100F900000DE15000001000000F615000001000051
+:100FA000004E16000001000000561600000100006F
+:100FB000005E16000001000000661600000100003F
+:100FC000006E16000001000000761600000100000F
+:100FD000007E1600000100000086160000010000DF
+:100FE000008E16000011000000CE1600008168ACD3
+:100FF0000FD61600000F00000016170000110000A9
+:10100000001E170000010000007E170000DFBFE394
+:101010000486170000DFBFE3048E17000001000004
+:10102000009E17000000FFFF00A61700000100004F
+:1010300000BE17000000FFFF0006180000010000BE
+:101040000016180000010000001E1800000010200B
+:101050003026180000405060702E1800008898A8B4
+:10106000B836180000C8D8E8F8461800001A000082
+:10107000005618000004000000FE180000040000E4
+:101080000006190000040000000E19000000010213
+:101090000336190000040000004E1900000400008F
+:1010A0000056190000040000005E190000800000D6
+:1010B0000066190000001E00006E19000004000008
+:1010C00000961A0000040000009E1A000080000034
+:1010D00000A61A000004000000AE1A000000010281
+:1010E00003B61A000003000000BE1A0000001E0034
+:1010F00000C61A000004000000EE1A000004000000
+:1011000000F61A000003000000161B000004000097
+:1011100000E81E000021000000F01E000001000099
+:1011200000F81E000002000000001F000000010087
+:1011300000081F000000010000101F000001000057
+:1011400000281F000001000000301F000002000006
+:1011500000381F000000010000401F0000000100D7
+:1011600000481F000001000000BE2B00000400002A
+:1011700000C62B000003000000D12C00000400007A
+:1011800000D92C000004000000E92C0000800000C1
+:1011900000F12C000004000000F92C000001000008
+:1011A00000092D000027000000192D000026000076
+:1011B00000135200000F00000054560000FFFF3FD4
+:1011C000006C560000FF1F0000F0690000000000E6
+:1011D00004F869000000000004006A00000000003C
+:1011E00004086A000000000004106A00000000000B
+:1011F00004186A000000000004206A0000000000DB
+:1012000004286A000000000004306A0000000000AA
+:1012100004386A000000000004406A00000000007A
+:1012200004486A000000000004506A00000000004A
+:1012300004586A000000000004606A00000000001A
+:1012400004686A000000000004906B0000DFBFE348
+:1012500004986B0000DFBFE304B06B000021FE01C7
+:1012600000B86B00008168AC0FE06B0000120C103E
+:1012700008086C000000010000206C000001000163
+:1012800000306C000001000100386C00000100001B
+:1012900000406C000001000100486C0000010000EB
+:1012A00000506C000004000000586C0000020000B8
+:1012B00000C86F00000000803F00700000040000C4
+:1012C00000087000001A00000020700000010000FB
+:1012D00000B870000000FFFF00F07000000F000079
+:1012E00000307100008168AC0F38710000110000FF
+:1012F00000B871000004000000D07100000100007F
+:1013000000E871000002000000F071000000000021
+:1013100004F87100000000000418720000050000CD
+:10132000002072000052000000487200000100001E
+:1013300000D07200000000803FD8720000000080E2
+:101340003FE07200000000803FE872000000008073
+:101350003FF07200000000803FF872000000008043
+:101360003F007300000000803F0873000000008011
+:101370003F107300000000803F18730000000080E1
+:101380003F207300000000803F28730000000080B1
+:101390003F307300000000803F3873000000008081
+:1013A0003F407300000000803F4873000000008051
+:1013B0003F507300001000000088740000120C10F1
+:1013C000089074000005000000A8740000010000EF
+:1013D00000B8740000FFFF0000C0740000FFFF00B1
+:1013E00000C8740000FFFF0000D0740000FFFF0081
+:1013F00000D874000003000000F874000000FFFF34
+:1014000000007500001A00000010750000030000C5
+:1014100000F87600000201000008770000040000D8
+:10142000001077000004000000187700000400009E
+:10143000002077000004000000687700000400002E
+:1014400000707700000400000080770000FF0700B4
+:10145000009077000002010000E077000004000027
+:1014600000E877000004000000F0770000040000AE
+:1014700000F8770000040000009AE6000004000075
+:1014800000A2E6000004000000AAE60000120C1012
+:1014900008B2E6000003000000C2E60000120C10D3
+:1014A00008D2E60000140C0800DAE6000001000093
+:1014B00000E2E6000004000000EAE600000400008C
+:1014C00000F2E60000140C08000AE70000120C10FD
+:1014D0000812E70000270000002AE70000010000D2
+:1014E000003A05010001000000F2050100120C1095
+:1014F0000800060100120C10081006010080000010
+:10150000001806010004700080200601000004009D
+:101510000428060100C00000003006010000100091
+:101520000048060100000E000050060100001E00E9
+:1015300000580601000100000070060100010000D3
+:10154000008006010004000000880601000200007F
+:1015500000F006010080000000F8060100047000A1
+:1015600080000701000004000408070100C000001B
+:1015700000100701000010000028070100000E0005
+:101580000030070100001E000038070100010000C4
+:101590000050070100010000006007010004000086
+:1015A000006807010002000000C8070100120C10CB
+:1015B00008D807010021FE010008080100FFFF0014
+:1015C0000010080100FFFF000018080100FFFF00E5
+:1015D0000020080100FFFF000028080100010000B2
+:1015E000003008010001000100380801000100017D
+:1015F0000040080100010000005008010021FE0128
+:101600000080080100120C10088808010004000086
+:10161000009808010002000000A00801001100006D
+:1016200000E80801008168AC0F1009010004000007
+:1016300000600901000200000068090100010000CB
+:10164000007009010001000000780901000200009B
+:10165000008009010001000000880901000100006C
+:10166000009009010001000000A009010004000031
+:1016700000C026010011000000D02601000100007A
+:011680000069
+:00000001FF
--
1.6.5.2
--- NEW FILE patch-2.6.33-rc3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLQ+R9yGugalF9Dw4RAg5+AJ9jefm12AJfkNtHOOM1JWh5npDEcACeOyul
piC63ZzIcCVLQvJM7+M96Gk=
=eh0V
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -p -r1.1151 -r1.1152
--- .cvsignore 11 Jan 2010 16:41:40 -0000 1.1151
+++ .cvsignore 11 Jan 2010 19:38:42 -0000 1.1152
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
-patch-2.6.32.3.bz2
+patch-2.6.33-rc3.bz2
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- Makefile 5 Jan 2010 11:21:12 -0000 1.120
+++ Makefile 11 Jan 2010 19:38:42 -0000 1.121
@@ -87,6 +87,11 @@ debug:
@perl -pi -e 's/# CONFIG_FUNCTION_TRACER is not set/CONFIG_FUNCTION_TRACER=y/' config-nodebug
@perl -pi -e 's/# CONFIG_STACK_TRACER is not set/CONFIG_STACK_TRACER=y/' config-nodebug
@perl -pi -e 's/# CONFIG_DYNAMIC_FTRACE is not set/CONFIG_DYNAMIC_FTRACE=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DEBUG_CFQ_IOSCHED is not set/CONFIG_DEBUG_CFQ_IOSCHED=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DRBD_FAULT_INJECTION is not set/CONFIG_DRBD_FAULT_INJECTION=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_ATH_DEBUG is not set/CONFIG_ATH_DEBUG=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/CONFIG_IWLWIFI_DEVICE_TRACING=y/' config-nodebug
+ @perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_WORK is not set/CONFIG_DEBUG_OBJECTS_WORK=y/' config-nodebug
@# just in case we're going from extremedebug -> debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -142,6 +147,12 @@ release:
@perl -pi -e 's/CONFIG_FUNCTION_TRACER=y/# CONFIG_FUNCTION_TRACER is not set/' config-nodebug
@perl -pi -e 's/CONFIG_STACK_TRACER=y/# CONFIG_STACK_TRACER is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DYNAMIC_FTRACE=y/# CONFIG_DYNAMIC_FTRACE is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_CFQ_IOSCHED=y/# CONFIG_DEBUG_CFQ_IOSCHED is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DRBD_FAULT_INJECTION=y/# CONFIG_DRBD_FAULT_INJECTION is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_ATH_DEBUG=y/# CONFIG_ATH_DEBUG is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_IWLWIFI_DEVICE_TRACING=y/# CONFIG_IWLWIFI_DEVICE_TRACING is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_OBJECTS_WORK=y/# CONFIG_DEBUG_OBJECTS_WORK is not set/' config-nodebug
+ @perl -pi -e 's/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y/# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set/' config-nodebug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-debug
@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
Index: config-arm
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-arm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- config-arm 15 Sep 2009 15:12:45 -0000 1.5
+++ config-arm 11 Jan 2010 19:38:43 -0000 1.6
@@ -100,3 +100,6 @@ CONFIG_RTC_DRV_PL031=m
CONFIG_ARM_UNWIND=y
CONFIG_RCU_FANOUT=32
+
+# CONFIG_USB_ULPI is not set
+# CONFIG_OC_ETM is not set
Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- config-debug 10 Dec 2009 01:41:24 -0000 1.37
+++ config-debug 11 Jan 2010 19:38:43 -0000 1.38
@@ -66,3 +66,13 @@ CONFIG_JBD2_DEBUG=y
CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y
CONFIG_DYNAMIC_FTRACE=y
+
+CONFIG_DEBUG_CFQ_IOSCHED=y
+
+CONFIG_DRBD_FAULT_INJECTION=y
+
+CONFIG_ATH_DEBUG=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- config-generic 11 Jan 2010 16:19:58 -0000 1.344
+++ config-generic 11 Jan 2010 19:38:43 -0000 1.345
@@ -45,6 +45,7 @@ CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y
CONFIG_USER_NS=y
CONFIG_PID_NS=y
@@ -62,6 +63,10 @@ CONFIG_SLUB=y
# CONFIG_SLUB_STATS is not set
CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+CONFIG_IWMC3200TOP=m
+# CONFIG_IWMC3200TOP_DEBUG is not set
+CONFIG_IWMC3200TOP_DEBUGFS=y
#
# Loadable module support
@@ -545,6 +550,10 @@ CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_BE2ISCSI=m
CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_PM8001=m
+CONFIG_VMWARE_PVSCSI=m
CONFIG_ATA=y
CONFIG_ATA_VERBOSE_ERROR=y
@@ -615,6 +624,7 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SCH=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
@@ -819,6 +829,7 @@ CONFIG_INET6_ESP=m
CONFIG_INET6_IPCOMP=m
CONFIG_IPV6_MIP6=y
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -1381,6 +1392,7 @@ CONFIG_WLAN_80211=y
CONFIG_WIRELESS=y
CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CFG80211_DEBUGFS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -1413,6 +1425,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
CONFIG_WIMAX_I2400M_USB=m
CONFIG_WIMAX_I2400M_SDIO=m
CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+CONFIG_WIMAX_IWMC3200_SDIO=y
CONFIG_ADM8211=m
CONFIG_ATH_COMMON=m
@@ -1420,6 +1433,7 @@ CONFIG_ATH5K=m
CONFIG_ATH5K_DEBUG=y
CONFIG_ATH9K=m
# CONFIG_ATH9K_DEBUG is not set
+CONFIG_ATH9K_DEBUGFS=y
CONFIG_AT76C50X_USB=m
CONFIG_AIRO=m
CONFIG_AIRO_CS=m
@@ -1505,6 +1519,7 @@ CONFIG_RT61PCI_LEDS=y
CONFIG_RT2500USB=m
CONFIG_RT2500USB_LEDS=y
CONFIG_RT2800USB=m
+CONFIG_RT2800PCI=m
CONFIG_RT73USB=m
CONFIG_RT73USB_LEDS=y
CONFIG_RTL8180=m
@@ -1782,6 +1797,7 @@ CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVAS_MAINT=m
CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
CONFIG_GIGASET_BASE=m
CONFIG_GIGASET_M101=m
CONFIG_GIGASET_M105=m
@@ -1821,6 +1837,7 @@ CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m
CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
#
# Input I/O drivers
@@ -1834,6 +1851,7 @@ CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
@@ -1913,6 +1931,7 @@ CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
CONFIG_TOUCHSCREEN_USB_E2I=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
# CONFIG_TOUCHSCREEN_WM97XX is not set
CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_W90X900=m
@@ -2105,7 +2124,9 @@ CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_SENSORS_LIS3_I2C=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
@@ -2151,6 +2172,7 @@ CONFIG_SENSORS_LM95241=m
CONFIG_SENSORS_TMP421=m
CONFIG_SENSORS_WM8350=m
CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_LM73=m
CONFIG_W1=m
CONFIG_W1_CON=y
@@ -2265,6 +2287,9 @@ CONFIG_RTC_DRV_BQ4802=m
CONFIG_RTC_DRV_WM8350=m
CONFIG_RTC_DRV_AB3100=m
CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_RP5C01=m
CONFIG_DTLK=m
CONFIG_R3964=m
@@ -2304,6 +2329,7 @@ CONFIG_DRM_NOUVEAU_KMS=y
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_NOUVEAU_DEBUG=y
CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_VMWGFX=m
#
# PCMCIA character devices
@@ -2429,6 +2455,7 @@ CONFIG_DVB_USB_AF9015=m
CONFIG_DVB_USB_ANYSEE=m
CONFIG_DVB_USB_DW2102=m
CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_EC168=m
CONFIG_DVB_DM1105=m
CONFIG_DVB_DRX397XD=m
CONFIG_DVB_LGDT3304=m
@@ -2436,6 +2463,7 @@ CONFIG_DVB_S921=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_LGS8GL5=m
CONFIG_DVB_DUMMY_FE=m
+CONFIG_DVB_FIREDTV=m
#
# Supported SAA7146 based PCI Adapters
@@ -2691,6 +2719,7 @@ CONFIG_SND_CTXFI=m
CONFIG_SND_LX6464ES=m
CONFIG_SND_HDA_INTEL=y
CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_JACK=y
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_HWDEP=y
@@ -2899,6 +2928,8 @@ CONFIG_USB_GSPCA_VC032X=m
CONFIG_USB_GSPCA_ZC3XX=m
CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GL860=m
CONFIG_USB_GSPCA_JEILINJ=m
@@ -2919,6 +2950,9 @@ CONFIG_SOC_CAMERA_MT9M111=m
CONFIG_SOC_CAMERA_MT9T031=m
CONFIG_SOC_CAMERA_TW9910=m
CONFIG_SOC_CAMERA_OV772X=m
+CONFIG_SOC_CAMERA_MT9T112=m
+CONFIG_SOC_CAMERA_RJ54N1=m
+CONFIG_SOC_CAMERA_OV9640=m
#
# USB Network adaptors
@@ -3085,6 +3119,7 @@ CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
CONFIG_RADIO_SI4713=m
+# CONFIG_RADIO_TEF6862 is not set
CONFIG_USB_MR800=m
CONFIG_USB_STKWEBCAM=m
# CONFIG_USB_TEST is not set
@@ -3127,7 +3162,7 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_WM8400=m
CONFIG_MFD_WM8350_I2C=m
CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM831X=m
+# CONFIG_MFD_WM831X is not set
CONFIG_AB3100_OTP=m
#
@@ -3798,6 +3833,10 @@ CONFIG_LEDS_ALIX2=m
CONFIG_LEDS_WM8350=m
CONFIG_LEDS_LP3944=m
CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_INTEL_SS4200=m
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
@@ -3989,6 +4028,7 @@ CONFIG_REGULATOR_AB3100=m
CONFIG_REGULATOR_TPS65023=m
CONFIG_REGULATOR_TPS6507X=m
CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_MAX8660=m
CONFIG_WM8350_POWER=m
@@ -4056,6 +4096,11 @@ CONFIG_USB_ATMEL=m
# CONFIG_VIDEO_CX25821 is not set
# CONFIG_RT3090 is not set
# CONFIG_HYPERV is not set
+# CONFIG_R8187SE is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_BATMAN_ADV is not set
+# CONFIG_FB_SM7XX is not set
#
# Android
@@ -4154,3 +4199,26 @@ CONFIG_DETECT_HUNG_TASK=y
CONFIG_MEMORY_FAILURE=y
CONFIG_HWPOISON_INJECT=m
+
+CONFIG_BLK_DEV_DRBD=m
+
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_MOUSE_GPIO is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_CS5535 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_RADIO_MIROPCM20 is not set
+# CONFIG_USB_GPIO_VBUS is not set
+
+
+CONFIG_KSYM_TRACER=y
+CONFIG_PROFILE_KSYM_TRACER=y
+CONFIG_KPROBE_EVENT=y
Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- config-nodebug 10 Dec 2009 01:41:24 -0000 1.49
+++ config-nodebug 11 Jan 2010 19:38:43 -0000 1.50
@@ -66,3 +66,13 @@ CONFIG_JBD2_DEBUG=y
CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y
CONFIG_DYNAMIC_FTRACE=y
+
+CONFIG_DEBUG_CFQ_IOSCHED=y
+
+CONFIG_DRBD_FAULT_INJECTION=y
+
+CONFIG_ATH_DEBUG=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y
Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- config-powerpc-generic 8 Oct 2009 05:58:45 -0000 1.52
+++ config-powerpc-generic 11 Jan 2010 19:38:43 -0000 1.53
@@ -238,20 +238,13 @@ CONFIG_EXTRA_TARGETS=""
# CONFIG_RAPIDIO is not set
# CONFIG_FS_ENET is not set
# CONFIG_UCC_GETH is not set
-# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_MATRIX is not set
-# CONFIG_MOUSE_GPIO is not set
# CONFIG_SERIAL_CPM is not set
# CONFIG_SERIAL_QE is not set
# CONFIG_I2C_CPM is not set
-# CONFIG_I2C_GPIO is not set
-# CONFIG_W1_MASTER_GPIO is not set
# CONFIG_MT9M001_PCA9536_SWITCH is not set
# CONFIG_MT9V022_PCA9536_SWITCH is not set
-# CONFIG_LEDS_GPIO is not set
# CONFIG_KGDB_CONSOLE is not set
-# CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_MAX732X is not set
CONFIG_MDIO_OF_GPIO=m
@@ -276,8 +269,6 @@ CONFIG_MCU_MPC8349EMITX=m
CONFIG_GPIO_XILINX=y
-CONFIG_UCB1400_CORE=m
-
CONFIG_PMIC_DA903X=y
CONFIG_BACKLIGHT_DA903X=m
CONFIG_LEDS_DA903X=m
@@ -305,7 +296,6 @@ CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL=m
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=m
-CONFIG_USB_GPIO_VBUS=m
CONFIG_USB_FHCI_HCD=m
# CONFIG_FHCI_DEBUG is not set
@@ -339,3 +329,17 @@ CONFIG_GPIO_WM831X=m
# CONFIG_GPIO_UCB1400 is not set
CONFIG_EDAC_MPC85XX=m
+CONFIG_NR_IRQS=512
+CONFIG_SPARSE_IRQ=y
+
+CONFIG_PPC_MPC5200_LPBFIFO=m
+CONFIG_CAN_MSCAN=m
+CONFIG_CAN_MPC5XXX=m
+CONFIG_PATA_MACIO=m
+CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_88PM8607 is not set
+# CONFIG_XPS_USB_HCD_XILINX is not set
+# CONFIG_MMC_SDHCI_OF_ESDHC is not set
+# CONFIG_MMC_SDHCI_OF_HLWD is not set
+
Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- config-powerpc32-generic 28 Sep 2009 22:57:22 -0000 1.36
+++ config-powerpc32-generic 11 Jan 2010 19:38:43 -0000 1.37
@@ -182,8 +182,6 @@ CONFIG_MPC8610_HPCD=y
CONFIG_MTD_NAND_FSL_UPM=m
-CONFIG_USB_GPIO_VBUS=m
-
CONFIG_RCU_FANOUT=32
CONFIG_PERF_COUNTERS=y
Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- config-powerpc64 28 Sep 2009 22:57:22 -0000 1.35
+++ config-powerpc64 11 Jan 2010 19:38:43 -0000 1.36
@@ -187,3 +187,6 @@ CONFIG_RCU_FANOUT=64
CONFIG_PERF_COUNTERS=y
CONFIG_PERF_EVENTS=y
CONFIG_EVENT_PROFILE=y
+
+CONFIG_KVM_BOOK3S_64=m
+# CONFIG_KVM_EXIT_TIMING is not set
Index: config-sparc64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-sparc64-generic,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- config-sparc64-generic 28 Sep 2009 22:57:22 -0000 1.30
+++ config-sparc64-generic 11 Jan 2010 19:38:44 -0000 1.31
@@ -209,3 +209,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
CONFIG_PERF_COUNTERS=y
CONFIG_PERF_EVENTS=y
CONFIG_EVENT_PROFILE=y
+
+CONFIG_EARLYFB=y
+CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- config-x86-generic 11 Oct 2009 07:29:06 -0000 1.91
+++ config-x86-generic 11 Jan 2010 19:38:44 -0000 1.92
@@ -409,6 +409,7 @@ CONFIG_THINKPAD_ACPI=m
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
CONFIG_MACINTOSH_DRIVERS=y
@@ -496,3 +497,16 @@ CONFIG_EDAC_DECODE_MCE=m
CONFIG_GPIO_LANGWELL=y
# CONFIG_INTEL_TXT is not set
+
+CONFIG_CS5535_MFGPT=m
+CONFIG_GEODE_WDT=m
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+
+CONFIG_LEDS_INTEL_SS4200=m
+
+CONFIG_X86_DECODER_SELFTEST=y
+
+CONFIG_ACPI_CMPC=m
+CONFIG_MSI_WMI=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+# CONFIG_SAMSUNG_LAPTOP is not set
Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- config-x86_64-generic 20 Nov 2009 23:02:09 -0000 1.97
+++ config-x86_64-generic 11 Jan 2010 19:38:44 -0000 1.98
@@ -131,6 +131,7 @@ CONFIG_THINKPAD_ACPI=m
CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
CONFIG_THINKPAD_ACPI_BAY=y
CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
CONFIG_HOTPLUG_PCI=y
@@ -398,3 +399,15 @@ CONFIG_GPIO_LANGWELL=y
CONFIG_FUNCTION_GRAPH_TRACER=y
+CONFIG_ACPI_CMPC=m
+CONFIG_MSI_WMI=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+# CONFIG_SAMSUNG_LAPTOP is not set
+
+CONFIG_CS5535_MFGPT=m
+CONFIG_GEODE_WDT=m
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+
+CONFIG_X86_DECODER_SELFTEST=y
+
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=y
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1884
retrieving revision 1.1885
diff -u -p -r1.1884 -r1.1885
--- kernel.spec 11 Jan 2010 16:41:43 -0000 1.1884
+++ kernel.spec 11 Jan 2010 19:38:44 -0000 1.1885
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Versions of various parts
@@ -27,7 +27,7 @@ Summary: The Linux kernel
# 1.1205.1.1. In this case we drop the initial 1, subtract fedora_cvs_origin
# from the second number, and then append the rest of the RCS string as is.
# Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin 1863
+%define fedora_cvs_origin 1883
%define fedora_cvs_revision() %2
%global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
@@ -40,7 +40,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 3
+%define stable_update 0
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -59,7 +59,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 0
+%define rcrev 3
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -636,8 +636,6 @@ Patch303: linux-2.6-enable-btusb-autosus
Patch304: linux-2.6-usb-uvc-autosuspend.diff
Patch305: linux-2.6-fix-btusb-autosuspend.patch
-Patch310: linux-2.6-autoload-wmi.patch
-
Patch340: linux-2.6-debug-vm-would-have-oomkilled.patch
Patch360: linux-2.6-debug-always-inline-kzalloc.patch
Patch380: linux-2.6-defaults-pci_no_msi.patch
@@ -660,7 +658,6 @@ Patch530: linux-2.6-silence-fbcon-logo.p
Patch570: linux-2.6-selinux-mprotect-checks.patch
Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch600: linux-2.6-defaults-alsa-hda-beep-off.patch
Patch610: hda_intel-prealloc-4mb-dmabuffer.patch
Patch670: linux-2.6-ata-quirk.patch
@@ -673,8 +670,6 @@ Patch701: linux-2.6.31-modules-ro-nx.pat
Patch800: linux-2.6-crash-driver.patch
-Patch900: linux-2.6-pci-cacheline-sizing.patch
-
Patch1515: lirc-2.6.32.patch
Patch1517: hdpvr-ir-enable.patch
@@ -687,13 +682,13 @@ Patch1811: drm-radeon-fixes.patch
Patch1812: drm-radeon-dp-support.patch
Patch1813: drm-radeon-pm.patch
Patch1814: drm-nouveau.patch
+Patch1815: drm_nouveau_ucode.patch
Patch1818: drm-i915-resume-force-mode.patch
Patch1819: drm-intel-big-hammer.patch
Patch1821: drm-page-flip.patch
# intel drm is all merged upstream
Patch1824: drm-intel-next.patch
Patch1825: drm-intel-pm.patch
-Patch1827: linux-2.6-intel-agp-clear-gtt.patch
Patch1828: drm-radeon-fix-crtc-vbl-update-for-r600.patch
# kludge to make ich9 e1000 work
@@ -715,11 +710,9 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
# fs fixes
# NFSv4
-Patch3050: linux-2.6-nfsd4-proots.patch
Patch3051: linux-2.6-nfs4-callback-hidden.patch
# VIA Nano / VX8xx updates
-Patch11010: via-hwmon-temp-sensor.patch
# patches headed upstream
Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
@@ -1150,7 +1143,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
# Architecture patches
# x86(-64)
-ApplyPatch via-hwmon-temp-sensor.patch
ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
#
@@ -1180,7 +1172,7 @@ ApplyPatch linux-2.6.29-sparc-IOC_TYPECH
#
# Exec shield
#
-ApplyPatch linux-2.6-execshield.patch
+#ApplyPatch linux-2.6-execshield.patch FIXME(maybe?)
#
# bugfixes to drivers and filesystems
@@ -1195,7 +1187,6 @@ ApplyPatch linux-2.6-execshield.patch
# eCryptfs
# NFSv4
-ApplyPatch linux-2.6-nfsd4-proots.patch
ApplyPatch linux-2.6-nfs4-callback-hidden.patch
# USB
@@ -1205,7 +1196,6 @@ ApplyPatch linux-2.6-usb-uvc-autosuspend
#ApplyPatch linux-2.6-fix-btusb-autosuspend.patch
# WMI
-ApplyPatch linux-2.6-autoload-wmi.patch
# ACPI
ApplyPatch linux-2.6-defaults-acpi-video.patch
@@ -1235,8 +1225,6 @@ ApplyPatch linux-2.6-defaults-aspm.patch
#
# ALSA
-# squelch hda_beep by default
-ApplyPatch linux-2.6-defaults-alsa-hda-beep-off.patch
ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
# Networking
@@ -1288,9 +1276,6 @@ ApplyPatch linux-2.6-ata-quirk.patch
# /dev/crash driver.
ApplyPatch linux-2.6-crash-driver.patch
-# Determine cacheline sizes in a generic manner.
-ApplyPatch linux-2.6-pci-cacheline-sizing.patch
-
# http://www.lirc.org/
ApplyPatch lirc-2.6.32.patch
# enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
@@ -1301,7 +1286,7 @@ ApplyPatch hdpvr-ir-enable.patch
#ApplyPatch linux-2.6-ksm-kvm.patch
# Assorted Virt Fixes
-ApplyPatch linux-2.6-userspace_kvmclock_offset.patch
+#ApplyPatch linux-2.6-userspace_kvmclock_offset.patch
# Fix block I/O errors in KVM
#ApplyPatch linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
@@ -1309,9 +1294,11 @@ ApplyPatch linux-2.6-userspace_kvmclock_
ApplyPatch linux-2.6-e1000-ich9.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-radeon-fixes.patch
-ApplyPatch drm-radeon-dp-support.patch
-ApplyPatch drm-nouveau.patch
+#ApplyPatch drm-radeon-fixes.patch FIXME
+#ApplyPatch drm-radeon-dp-support.patch FIXME
+#ApplyPatch drm-nouveau.patch (upstream?)
+# squash nouveau firmware into a single commit until it gets into linux-firmware
+ApplyPatch drm_nouveau_ucode.patch
# pm broken on my thinkpad t60p - airlied
#ApplyPatch drm-radeon-pm.patch
#ApplyPatch drm-i915-resume-force-mode.patch
@@ -1320,8 +1307,6 @@ ApplyPatch drm-intel-big-hammer.patch
ApplyOptionalPatch drm-intel-next.patch
#this appears to be upstream - mjg59?
#ApplyPatch drm-intel-pm.patch
-# Some BIOSes don't clear the whole GTT, and it causes IOMMU faults
-ApplyPatch linux-2.6-intel-agp-clear-gtt.patch
#ApplyPatch drm-radeon-fix-crtc-vbl-update-for-r600.patch
# linux1394 git patches
@@ -1995,6 +1980,17 @@ fi
# and build.
%changelog
+* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com>
+- Linux 2.6.33-rc3
+- utrace: rebased from roland's people page.
+- via-hwmon-temp-sensor.patch: upstream.
+- linux-2.6-defaults-alsa-hda-beep-off.patch: new config option supercedes.
+- readd nouveau ctxprogs as firmware/ like it should be.
+- linux-2.6-pci-cacheline-sizing.patch: upstream.
+- linux-2.6-intel-agp-clear-gtt.patch: upstream.
+- linux-2.6-nfsd4-proots.patch: upstream?
+- rebased the rest.
+
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-21
- Linux 2.6.32.3
- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
linux-2.6-debug-nmi-timeout.patch:
arch/x86/kernel/apic/nmi.c | 2 +-
lib/Kconfig.debug | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
Index: linux-2.6-debug-nmi-timeout.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-nmi-timeout.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-debug-nmi-timeout.patch 8 Jul 2009 17:28:48 -0000 1.5
+++ linux-2.6-debug-nmi-timeout.patch 11 Jan 2010 19:38:45 -0000 1.6
@@ -1,7 +1,7 @@
-From 899dd25ae272c73407c1477ec223982d0b57a668 Mon Sep 17 00:00:00 2001
-From: Kyle McMartin <kyle at phobos.i.jkkm.org>
-Date: Wed, 8 Jul 2009 13:03:06 -0400
-Subject: [PATCH 2/6] fedora: linux-2.6-debug-nmi-timeout.patch
+From c2dcc88ee3aca407471246c38c11a100cca39076 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at treachery.i.jkkm.org>
+Date: Mon, 11 Jan 2010 08:20:51 -0500
+Subject: linux-2.6-debug-nmi-timeout.patch
---
arch/x86/kernel/apic/nmi.c | 2 +-
@@ -9,23 +9,23 @@ Subject: [PATCH 2/6] fedora: linux-2.6-d
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
-index b3025b4..e82a450 100644
+index 0159a69..2bbca2b 100644
--- a/arch/x86/kernel/apic/nmi.c
+++ b/arch/x86/kernel/apic/nmi.c
-@@ -436,7 +436,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
+@@ -439,7 +439,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
* wait a few IRQs (5 seconds) before doing the oops ...
*/
- local_inc(&__get_cpu_var(alert_counter));
-- if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz)
-+ if (local_read(&__get_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
+ __this_cpu_inc(per_cpu_var(alert_counter));
+- if (__this_cpu_read(per_cpu_var(alert_counter)) == 5 * nmi_hz)
++ if (__this_cpu_read(per_cpu_var(alert_counter)) == CONFIG_DEBUG_NMI_TIMEOUT * nmi_hz)
/*
* die_nmi will return ONLY if NOTIFY_STOP happens..
*/
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 12327b2..2790b4f 100644
+index 25c3ed5..6d67975 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
-@@ -245,6 +245,14 @@ config SCHEDSTATS
+@@ -253,6 +253,14 @@ config SCHEDSTATS
application, you can say N to avoid the very slight overhead
this adds.
@@ -41,5 +41,5 @@ index 12327b2..2790b4f 100644
bool "Collect kernel timers statistics"
depends on DEBUG_KERNEL && PROC_FS
--
-1.6.2.5
+1.6.5.2
linux-2.6-debug-vm-would-have-oomkilled.patch:
kernel/sysctl.c | 8 ++++++++
mm/oom_kill.c | 8 +++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
Index: linux-2.6-debug-vm-would-have-oomkilled.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-vm-would-have-oomkilled.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- linux-2.6-debug-vm-would-have-oomkilled.patch 28 Sep 2009 22:57:23 -0000 1.6
+++ linux-2.6-debug-vm-would-have-oomkilled.patch 11 Jan 2010 19:38:45 -0000 1.7
@@ -1,8 +1,18 @@
+From 03657519851cd180983db4bd0c38eaeed4aa2962 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at treachery.i.jkkm.org>
+Date: Mon, 11 Jan 2010 08:25:12 -0500
+Subject: linux-2.6-debug-vm-would-have-oomkilled.patch
+
+---
+ kernel/sysctl.c | 8 ++++++++
+ mm/oom_kill.c | 7 +++++++
+ 2 files changed, 15 insertions(+), 0 deletions(-)
+
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 0d949c5..8fb2bd9 100644
+index 8a68b24..72a4ff1 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -72,6 +72,7 @@ extern int sysctl_overcommit_ratio;
+@@ -71,6 +71,7 @@ extern int sysctl_overcommit_ratio;
extern int sysctl_panic_on_oom;
extern int sysctl_oom_kill_allocating_task;
extern int sysctl_oom_dump_tasks;
@@ -10,11 +20,10 @@ index 0d949c5..8fb2bd9 100644
extern int max_threads;
extern int core_uses_pid;
extern int suid_dumpable;
-@@ -1073,6 +1074,14 @@ static struct ctl_table vm_table[] = {
- .proc_handler = &proc_dointvec,
+@@ -973,6 +974,13 @@ static struct ctl_table vm_table[] = {
+ .proc_handler = proc_dointvec,
},
{
-+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "would_have_oomkilled",
+ .data = &sysctl_would_have_oomkilled,
+ .maxlen = sizeof(sysctl_would_have_oomkilled),
@@ -22,11 +31,11 @@ index 0d949c5..8fb2bd9 100644
+ .proc_handler = &proc_dointvec,
+ },
+ {
- .ctl_name = VM_OVERCOMMIT_RATIO,
.procname = "overcommit_ratio",
.data = &sysctl_overcommit_ratio,
+ .maxlen = sizeof(sysctl_overcommit_ratio),
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
-index ea2147d..788fe84 100644
+index f52481b..a892f07 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -31,6 +31,7 @@
@@ -37,7 +46,7 @@ index ea2147d..788fe84 100644
static DEFINE_SPINLOCK(zone_scan_lock);
/* #define DEBUG */
-@@ -356,6 +357,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
+@@ -396,6 +397,12 @@ static void __oom_kill_task(struct task_struct *p, int verbose)
return;
}
@@ -48,5 +57,8 @@ index ea2147d..788fe84 100644
+ }
+
if (verbose)
- printk(KERN_ERR "Killed process %d (%s)\n",
- task_pid_nr(p), p->comm);
+ printk(KERN_ERR "Killed process %d (%s) "
+ "vsz:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+--
+1.6.5.2
+
linux-2.6-dell-laptop-rfkill-fix.patch:
drivers/input/input.c | 91 ++++++++++++++++++++++++++++-----
drivers/platform/x86/dell-laptop.c | 100 +++++++++++++++++++++++++++++++++++++
include/linux/input.h | 6 +-
3 files changed, 183 insertions(+), 14 deletions(-)
Index: linux-2.6-dell-laptop-rfkill-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-dell-laptop-rfkill-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-dell-laptop-rfkill-fix.patch 31 Jul 2009 02:37:11 -0000 1.1
+++ linux-2.6-dell-laptop-rfkill-fix.patch 11 Jan 2010 19:38:46 -0000 1.2
@@ -1,8 +1,19 @@
+From caca5447fae9bfc87ab7d4af664d8bc95db6904d Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at treachery.i.jkkm.org>
+Date: Mon, 11 Jan 2010 08:08:02 -0500
+Subject: linux-2.6-dell-laptop-rfkill-fix.patch
+
+---
+ drivers/input/input.c | 91 ++++++++++++++++++++++++++++-----
+ drivers/platform/x86/dell-laptop.c | 100 ++++++++++++++++++++++++++++++++++++
+ include/linux/input.h | 5 ++
+ 3 files changed, 183 insertions(+), 13 deletions(-)
+
diff --git a/drivers/input/input.c b/drivers/input/input.c
-index 7c237e6..80f1e48 100644
+index ab06071..1911c3a 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
-@@ -88,19 +88,26 @@ static int input_defuzz_abs_event(int value, int old_val, int fuzz)
+@@ -90,19 +90,26 @@ static int input_defuzz_abs_event(int value, int old_val, int fuzz)
*/
static void input_pass_event(struct input_dev *dev,
unsigned int type, unsigned int code, int value)
@@ -37,7 +48,7 @@ index 7c237e6..80f1e48 100644
rcu_read_unlock();
}
-@@ -375,12 +382,15 @@ int input_grab_device(struct input_handle *handle)
+@@ -383,12 +390,15 @@ int input_grab_device(struct input_handle *handle)
}
EXPORT_SYMBOL(input_grab_device);
@@ -56,7 +67,7 @@ index 7c237e6..80f1e48 100644
/* Make sure input_pass_event() notices that grab is gone */
synchronize_rcu();
-@@ -404,12 +414,65 @@ void input_release_device(struct input_handle *handle)
+@@ -412,12 +422,65 @@ void input_release_device(struct input_handle *handle)
struct input_dev *dev = handle->dev;
mutex_lock(&dev->mutex);
@@ -123,7 +134,7 @@ index 7c237e6..80f1e48 100644
* input_open_device - open input device
* @handle: handle through which device is being accessed
*
-@@ -482,7 +545,9 @@ void input_close_device(struct input_handle *handle)
+@@ -490,7 +553,9 @@ void input_close_device(struct input_handle *handle)
mutex_lock(&dev->mutex);
@@ -134,38 +145,8 @@ index 7c237e6..80f1e48 100644
if (!--dev->users && dev->close)
dev->close(dev);
-diff --git a/include/linux/input.h b/include/linux/input.h
-index 8b3bc3e..e28f116 100644
---- a/include/linux/input.h
-+++ b/include/linux/input.h
-@@ -1118,6 +1118,7 @@ struct input_dev {
- int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
-
- struct input_handle *grab;
-+ struct input_handle *filter;
-
- spinlock_t event_lock;
- struct mutex mutex;
-@@ -1218,6 +1219,7 @@ struct input_handler {
- void *private;
-
- void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
-+ bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
- int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
- void (*disconnect)(struct input_handle *handle);
- void (*start)(struct input_handle *handle);
-@@ -1295,6 +1297,9 @@ void input_unregister_handle(struct input_handle *);
- int input_grab_device(struct input_handle *);
- void input_release_device(struct input_handle *);
-
-+int input_filter_device(struct input_handle *);
-+void input_unfilter_device(struct input_handle *);
-+
- int input_open_device(struct input_handle *);
- void input_close_device(struct input_handle *);
-
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
-index 74909c4..71a4149 100644
+index 3780994..25247be 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -22,6 +22,7 @@
@@ -176,7 +157,7 @@ index 74909c4..71a4149 100644
#include "../../firmware/dcdbas.h"
#define BRIGHTNESS_TOKEN 0x7d
-@@ -206,6 +207,16 @@ static const struct rfkill_ops dell_rfkill_ops = {
+@@ -214,6 +215,16 @@ static const struct rfkill_ops dell_rfkill_ops = {
.query = dell_rfkill_query,
};
@@ -190,10 +171,10 @@ index 74909c4..71a4149 100644
+ dell_rfkill_query(wwan_rfkill, (void *)3);
+}
+
- static int dell_setup_rfkill(void)
+ static int __init dell_setup_rfkill(void)
{
struct calling_interface_buffer buffer;
-@@ -310,6 +321,90 @@ static struct backlight_ops dell_ops = {
+@@ -338,6 +349,90 @@ static struct backlight_ops dell_ops = {
.update_status = dell_send_intensity,
};
@@ -284,8 +265,8 @@ index 74909c4..71a4149 100644
static int __init dell_init(void)
{
struct calling_interface_buffer buffer;
-@@ -333,6 +428,10 @@ static int __init dell_init(void)
- goto out;
+@@ -373,6 +468,10 @@ static int __init dell_init(void)
+ goto fail_rfkill;
}
+ if (input_register_handler(&dell_input_handler))
@@ -295,29 +276,44 @@ index 74909c4..71a4149 100644
#ifdef CONFIG_ACPI
/* In the event of an ACPI backlight being available, don't
* register the platform controller.
-@@ -388,6 +487,7 @@ static void __exit dell_exit(void)
- rfkill_unregister(bluetooth_rfkill);
- if (wwan_rfkill)
- rfkill_unregister(wwan_rfkill);
+@@ -426,6 +525,7 @@ static void __exit dell_exit(void)
+ {
+ backlight_device_unregister(dell_backlight_device);
+ dell_cleanup_rfkill();
+ input_unregister_handler(&dell_input_handler);
}
module_init(dell_init);
-diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
-index 71a4149..e559fa1 100644
---- a/drivers/platform/x86/dell-laptop.c
-+++ b/drivers/platform/x86/dell-laptop.c
-@@ -198,8 +198,8 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
- dell_send_request(&buffer, 17, 11);
- status = buffer.output[1];
-
-- if (status & BIT(bit))
-- rfkill_set_hw_state(rfkill, !!(status & BIT(16)));
-+ rfkill_set_sw_state(rfkill, !!(status & BIT(bit)));
-+ rfkill_set_hw_state(rfkill, !(status & BIT(16)));
- }
+diff --git a/include/linux/input.h b/include/linux/input.h
+index 7be8a65..7d49094 100644
+--- a/include/linux/input.h
++++ b/include/linux/input.h
+@@ -1127,6 +1127,7 @@ struct input_dev {
+ int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
+
+ struct input_handle *grab;
++ struct input_handle *filter;
+
+ spinlock_t event_lock;
+ struct mutex mutex;
+@@ -1227,6 +1228,7 @@ struct input_handler {
+ void *private;
+
+ void (*event)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
++ bool (*filter)(struct input_handle *handle, unsigned int type, unsigned int code, int value);
+ int (*connect)(struct input_handler *handler, struct input_dev *dev, const struct input_device_id *id);
+ void (*disconnect)(struct input_handle *handle);
+ void (*start)(struct input_handle *handle);
+@@ -1307,6 +1309,9 @@ void input_unregister_handle(struct input_handle *);
+ int input_grab_device(struct input_handle *);
+ void input_release_device(struct input_handle *);
+
++int input_filter_device(struct input_handle *);
++void input_unfilter_device(struct input_handle *);
++
+ int input_open_device(struct input_handle *);
+ void input_close_device(struct input_handle *);
- static const struct rfkill_ops dell_rfkill_ops = {
--
-1.6.3.3
+1.6.5.2
linux-2.6-driver-level-usb-autosuspend.diff:
drivers/usb/core/driver.c | 16 ++++++++++++++++
include/linux/usb.h | 5 ++++-
2 files changed, 20 insertions(+), 1 deletion(-)
Index: linux-2.6-driver-level-usb-autosuspend.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-driver-level-usb-autosuspend.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6-driver-level-usb-autosuspend.diff 17 Dec 2009 16:49:39 -0000 1.2
+++ linux-2.6-driver-level-usb-autosuspend.diff 11 Jan 2010 19:38:46 -0000 1.3
@@ -11,11 +11,16 @@ Date: Tue Jun 9 20:11:47 2009 +0100
Signed-off-by: Matthew Garrett <mjg at redhat.com>
+---
+ drivers/usb/core/driver.c | 16 ++++++++++++++++
+ include/linux/usb.h | 4 ++++
+ 2 files changed, 20 insertions(+), 0 deletions(-)
+
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
-index 4f86447..f7caf00 100644
+index 60a45f1..03e0228 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
-@@ -1575,6 +1575,22 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
+@@ -1648,6 +1648,22 @@ void usb_autopm_put_interface_async(struct usb_interface *intf)
EXPORT_SYMBOL_GPL(usb_autopm_put_interface_async);
/**
@@ -39,24 +44,27 @@ index 4f86447..f7caf00 100644
* @intf: the usb_interface whose counter should be incremented
*
diff --git a/include/linux/usb.h b/include/linux/usb.h
-index a34fa89..0c22c64 100644
+index e101a2d..dd47590 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -543,6 +543,7 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
+@@ -540,6 +540,7 @@ extern struct usb_device *usb_find_device(u16 vendor_id, u16 product_id);
/* USB autosuspend and autoresume */
#ifdef CONFIG_USB_SUSPEND
+extern void usb_device_autosuspend_enable(struct usb_device *udev);
- extern int usb_autopm_set_interface(struct usb_interface *intf);
extern int usb_autopm_get_interface(struct usb_interface *intf);
extern void usb_autopm_put_interface(struct usb_interface *intf);
-@@ -568,6 +569,9 @@ static inline void usb_mark_last_busy(struct usb_device *udev)
+ extern int usb_autopm_get_interface_async(struct usb_interface *intf);
+@@ -563,6 +564,9 @@ static inline void usb_mark_last_busy(struct usb_device *udev)
#else
+static inline void usb_device_autosuspend_enable(struct usb_device *udev)
+{ }
+
- static inline int usb_autopm_set_interface(struct usb_interface *intf)
+ static inline int usb_autopm_get_interface(struct usb_interface *intf)
{ return 0; }
-
+ static inline int usb_autopm_get_interface_async(struct usb_interface *intf)
+--
+1.6.5.2
+
linux-2.6-rfkill-all.patch:
include/linux/input.h | 2 ++
include/linux/rfkill.h | 2 +-
net/rfkill/input.c | 9 ++++++++-
3 files changed, 11 insertions(+), 2 deletions(-)
Index: linux-2.6-rfkill-all.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-rfkill-all.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-rfkill-all.patch 10 Sep 2009 17:29:33 -0000 1.1
+++ linux-2.6-rfkill-all.patch 11 Jan 2010 19:38:47 -0000 1.2
@@ -1,5 +1,16 @@
+From 06d4bc456d4a43fc79288b576a7ff8a15109a3fd Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at treachery.i.jkkm.org>
+Date: Mon, 11 Jan 2010 08:47:44 -0500
+Subject: linux-2.6-rfkill-all.patch
+
+---
+ include/linux/input.h | 2 ++
+ include/linux/rfkill.h | 2 +-
+ net/rfkill/input.c | 8 ++++++++
+ 3 files changed, 11 insertions(+), 1 deletions(-)
+
diff --git a/include/linux/input.h b/include/linux/input.h
-index 8b3bc3e..20a622e 100644
+index 7be8a65..e358e78 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -595,6 +595,8 @@ struct input_absinfo {
@@ -8,14 +19,14 @@ index 8b3bc3e..20a622e 100644
+#define KEY_RFKILL 0x20c /* Key that controls all radios */
+
+ #define KEY_CAMERA_FOCUS 0x210
+
/* We avoid low common keys in module aliases so they don't get huge. */
- #define KEY_MIN_INTERESTING KEY_MUTE
- #define KEY_MAX 0x2ff
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
-index 278777f..4c39f7e 100644
+index 97059d0..4f82326 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
-@@ -32,7 +32,7 @@
+@@ -29,7 +29,7 @@
/**
* enum rfkill_type - type of rfkill switch.
*
@@ -50,3 +61,6 @@ index a7295ad..3713d7e 100644
.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT,
.evbit = { BIT(EV_SW) },
.swbit = { [BIT_WORD(SW_RFKILL_ALL)] = BIT_MASK(SW_RFKILL_ALL) },
+--
+1.6.5.2
+
linux-2.6-tracehook.patch:
include/linux/ptrace.h | 1 +
include/linux/sched.h | 1 +
include/linux/tracehook.h | 10 +++++-----
kernel/ptrace.c | 2 +-
kernel/signal.c | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
Index: linux-2.6-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-tracehook.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- linux-2.6-tracehook.patch 16 Dec 2009 22:09:41 -0000 1.10
+++ linux-2.6-tracehook.patch 11 Jan 2010 19:38:47 -0000 1.11
@@ -12,149 +12,15 @@ returns 0.
Signed-off-by: Oleg Nesterov <oleg at redhat.com>
Signed-off-by: Roland McGrath <roland at redhat.com>
---
- arch/powerpc/include/asm/ptrace.h | 2 +
- arch/powerpc/kernel/traps.c | 9 ++++++
- arch/x86/include/asm/ptrace.h | 2 +
- arch/x86/kernel/ptrace.c | 51 ++++++++++++++++++++----------------
- include/linux/ptrace.h | 24 +++++++++++------
- include/linux/sched.h | 1 +
- include/linux/tracehook.h | 15 ++++++++---
- kernel/ptrace.c | 2 +-
- kernel/signal.c | 13 ++++-----
- 9 files changed, 76 insertions(+), 43 deletions(-)
+ include/linux/ptrace.h | 1 +
+ include/linux/sched.h | 1 +
+ include/linux/tracehook.h | 10 +++++-----
+ kernel/ptrace.c | 2 +-
+ kernel/signal.c | 4 ++--
+ 5 files changed, 10 insertions(+), 8 deletions(-)
-diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
-index 8c34149..cbd759e 100644
---- a/arch/powerpc/include/asm/ptrace.h
-+++ b/arch/powerpc/include/asm/ptrace.h
-@@ -140,6 +140,8 @@ extern void user_enable_single_step(stru
- extern void user_enable_block_step(struct task_struct *);
- extern void user_disable_single_step(struct task_struct *);
-
-+#define ARCH_HAS_USER_SINGLE_STEP_INFO
-+
- #endif /* __ASSEMBLY__ */
-
- #endif /* __KERNEL__ */
-diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index 6f0ae1a..83b57ac 100644
---- a/arch/powerpc/kernel/traps.c
-+++ b/arch/powerpc/kernel/traps.c
-@@ -174,6 +174,15 @@ int die(const char *str, struct pt_regs
- return 0;
- }
-
-+void user_single_step_siginfo(struct task_struct *tsk,
-+ struct pt_regs *regs, siginfo_t *info)
-+{
-+ memset(info, 0, sizeof(*info));
-+ info->si_signo = SIGTRAP;
-+ info->si_code = TRAP_TRACE;
-+ info->si_addr = (void __user *)regs->nip;
-+}
-+
- void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
- {
- siginfo_t info;
-diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
-index 0f0d908..7a88a82 100644
---- a/arch/x86/include/asm/ptrace.h
-+++ b/arch/x86/include/asm/ptrace.h
-@@ -230,6 +230,8 @@ extern void user_enable_block_step(struc
- #define arch_has_block_step() (boot_cpu_data.x86 >= 6)
- #endif
-
-+#define ARCH_HAS_USER_SINGLE_STEP_INFO
-+
- struct user_desc;
- extern int do_get_thread_area(struct task_struct *p, int idx,
- struct user_desc __user *info);
-diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 7b058a2..ea35dee 100644
---- a/arch/x86/kernel/ptrace.c
-+++ b/arch/x86/kernel/ptrace.c
-@@ -1437,21 +1437,33 @@ const struct user_regset_view *task_user
- #endif
- }
-
--void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
-- int error_code, int si_code)
-+static void fill_sigtrap_info(struct task_struct *tsk,
-+ struct pt_regs *regs,
-+ int error_code, int si_code,
-+ struct siginfo *info)
- {
-- struct siginfo info;
--
- tsk->thread.trap_no = 1;
- tsk->thread.error_code = error_code;
-
-- memset(&info, 0, sizeof(info));
-- info.si_signo = SIGTRAP;
-- info.si_code = si_code;
-+ memset(info, 0, sizeof(*info));
-+ info->si_signo = SIGTRAP;
-+ info->si_code = si_code;
-+ info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
-+}
-
-- /* User-mode ip? */
-- info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
-+void user_single_step_siginfo(struct task_struct *tsk,
-+ struct pt_regs *regs,
-+ struct siginfo *info)
-+{
-+ fill_sigtrap_info(tsk, regs, 0, TRAP_BRKPT, info);
-+}
-+
-+void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
-+ int error_code, int si_code)
-+{
-+ struct siginfo info;
-
-+ fill_sigtrap_info(tsk, regs, error_code, si_code, &info);
- /* Send us the fake SIGTRAP */
- force_sig_info(SIGTRAP, &info, tsk);
- }
-@@ -1516,29 +1528,22 @@ asmregparm long syscall_trace_enter(stru
-
- asmregparm void syscall_trace_leave(struct pt_regs *regs)
- {
-+ bool step;
-+
- if (unlikely(current->audit_context))
- audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
-
- if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
- trace_sys_exit(regs, regs->ax);
-
-- if (test_thread_flag(TIF_SYSCALL_TRACE))
-- tracehook_report_syscall_exit(regs, 0);
--
- /*
- * If TIF_SYSCALL_EMU is set, we only get here because of
- * TIF_SINGLESTEP (i.e. this is PTRACE_SYSEMU_SINGLESTEP).
- * We already reported this syscall instruction in
-- * syscall_trace_enter(), so don't do any more now.
-- */
-- if (unlikely(test_thread_flag(TIF_SYSCALL_EMU)))
-- return;
--
-- /*
-- * If we are single-stepping, synthesize a trap to follow the
-- * system call instruction.
-+ * syscall_trace_enter().
- */
-- if (test_thread_flag(TIF_SINGLESTEP) &&
-- tracehook_consider_fatal_signal(current, SIGTRAP))
-- send_sigtrap(current, regs, 0, TRAP_BRKPT);
-+ step = unlikely(test_thread_flag(TIF_SINGLESTEP)) &&
-+ !test_thread_flag(TIF_SYSCALL_EMU);
-+ if (step || test_thread_flag(TIF_SYSCALL_TRACE))
-+ tracehook_report_syscall_exit(regs, step);
- }
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index 7456d7d..4802e2a 100644
+index 56f2d63..4802e2a 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -85,6 +85,7 @@ extern int ptrace_traceme(void);
@@ -165,82 +31,32 @@ index 7456d7d..4802e2a 100644
extern int ptrace_detach(struct task_struct *, unsigned int);
extern void ptrace_disable(struct task_struct *);
extern int ptrace_check_attach(struct task_struct *task, int kill);
-@@ -105,12 +106,7 @@ static inline int ptrace_reparented(stru
- {
- return child->real_parent != child->parent;
- }
--static inline void ptrace_link(struct task_struct *child,
-- struct task_struct *new_parent)
--{
-- if (unlikely(child->ptrace))
-- __ptrace_link(child, new_parent);
--}
-+
- static inline void ptrace_unlink(struct task_struct *child)
- {
- if (unlikely(child->ptrace))
-@@ -169,9 +165,9 @@ static inline void ptrace_init_task(stru
- INIT_LIST_HEAD(&child->ptraced);
- child->parent = child->real_parent;
- child->ptrace = 0;
-- if (unlikely(ptrace)) {
-+ if (unlikely(ptrace) && (current->ptrace & PT_PTRACED)) {
- child->ptrace = current->ptrace;
-- ptrace_link(child, current->parent);
-+ __ptrace_link(child, current->parent);
- }
- }
-
-@@ -278,6 +274,18 @@ static inline void user_enable_block_ste
- }
- #endif /* arch_has_block_step */
-
-+#ifdef ARCH_HAS_USER_SINGLE_STEP_INFO
-+extern void user_single_step_siginfo(struct task_struct *tsk,
-+ struct pt_regs *regs, siginfo_t *info);
-+#else
-+static inline void user_single_step_siginfo(struct task_struct *tsk,
-+ struct pt_regs *regs, siginfo_t *info)
-+{
-+ memset(info, 0, sizeof(*info));
-+ info->si_signo = SIGTRAP;
-+}
-+#endif
-+
- #ifndef arch_ptrace_stop_needed
- /**
- * arch_ptrace_stop_needed - Decide whether arch_ptrace_stop() should be called
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 75e6e60..6c8928b 100644
+index 8d4991b..44718d4 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -2060,6 +2060,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -2086,6 +2086,7 @@ extern int kill_pgrp(struct pid *pid, in
extern int kill_pid(struct pid *pid, int sig, int priv);
extern int kill_proc_info(int, struct siginfo *, pid_t);
extern int do_notify_parent(struct task_struct *, int);
+extern void do_notify_parent_cldstop(struct task_struct *, int);
extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
extern void force_sig(int, struct task_struct *);
- extern void force_sig_specific(int, struct task_struct *);
+ extern int send_sig(int, struct task_struct *, int);
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
-index 1eb44a9..c78b2f4 100644
+index 10db010..c78b2f4 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
-@@ -134,6 +134,13 @@ static inline __must_check int tracehook
+@@ -134,7 +134,7 @@ static inline __must_check int tracehook
*/
static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
{
+- if (step) {
+ if (step && (task_ptrace(current) & PT_PTRACED)) {
-+ siginfo_t info;
-+ user_single_step_siginfo(current, regs, &info);
-+ force_sig_info(SIGTRAP, &info, current);
-+ return;
-+ }
-+
- ptrace_report_syscall(regs);
- }
-
-@@ -149,7 +156,7 @@ static inline int tracehook_unsafe_exec(
+ siginfo_t info;
+ user_single_step_siginfo(current, regs, &info);
+ force_sig_info(SIGTRAP, &info, current);
+@@ -156,7 +156,7 @@ static inline int tracehook_unsafe_exec(
{
int unsafe = 0;
int ptrace = task_ptrace(task);
@@ -249,7 +65,7 @@ index 1eb44a9..c78b2f4 100644
if (ptrace & PT_PTRACE_CAP)
unsafe |= LSM_UNSAFE_PTRACE_CAP;
else
-@@ -171,7 +178,7 @@ static inline int tracehook_unsafe_exec(
+@@ -178,7 +178,7 @@ static inline int tracehook_unsafe_exec(
*/
static inline struct task_struct *tracehook_tracer_task(struct task_struct *tsk)
{
@@ -258,7 +74,7 @@ index 1eb44a9..c78b2f4 100644
return rcu_dereference(tsk->parent);
return NULL;
}
-@@ -379,7 +386,7 @@ static inline void tracehook_signal_hand
+@@ -386,7 +386,7 @@ static inline void tracehook_signal_hand
const struct k_sigaction *ka,
struct pt_regs *regs, int stepping)
{
@@ -267,7 +83,7 @@ index 1eb44a9..c78b2f4 100644
ptrace_notify(SIGTRAP);
}
-@@ -485,7 +492,7 @@ static inline int tracehook_get_signal(s
+@@ -492,7 +492,7 @@ static inline int tracehook_get_signal(s
*/
static inline int tracehook_notify_jctl(int notify, int why)
{
@@ -290,10 +106,10 @@ index 23bd09c..b7c1d32 100644
__ptrace_unlink(p);
diff --git a/kernel/signal.c b/kernel/signal.c
-index 6705320..9908335 100644
+index d09692b..9de342f 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
-@@ -1461,7 +1461,7 @@ int do_notify_parent(struct task_struct
+@@ -1497,7 +1497,7 @@ int do_notify_parent(struct task_struct
return ret;
}
@@ -302,7 +118,7 @@ index 6705320..9908335 100644
{
struct siginfo info;
unsigned long flags;
-@@ -1731,7 +1731,7 @@ static int do_signal_stop(int signr)
+@@ -1767,7 +1767,7 @@ static int do_signal_stop(int signr)
static int ptrace_signal(int signr, siginfo_t *info,
struct pt_regs *regs, void *cookie)
{
@@ -311,26 +127,3 @@ index 6705320..9908335 100644
return signr;
ptrace_signal_deliver(regs, cookie);
-@@ -1807,11 +1807,6 @@ relock:
-
- for (;;) {
- struct k_sigaction *ka;
--
-- if (unlikely(signal->group_stop_count > 0) &&
-- do_signal_stop(0))
-- goto relock;
--
- /*
- * Tracing can induce an artifical signal and choose sigaction.
- * The return value in @signr determines the default action,
-@@ -1823,6 +1818,10 @@ relock:
- if (unlikely(signr != 0))
- ka = return_ka;
- else {
-+ if (unlikely(signal->group_stop_count > 0) &&
-+ do_signal_stop(0))
-+ goto relock;
-+
- signr = dequeue_signal(current, ¤t->blocked,
- info);
-
linux-2.6-utrace.patch:
Documentation/DocBook/Makefile | 2
Documentation/DocBook/utrace.tmpl | 590 +++++++++
fs/proc/array.c | 3
include/linux/sched.h | 5
include/linux/tracehook.h | 87 +
include/linux/utrace.h | 692 ++++++++++
init/Kconfig | 9
kernel/Makefile | 1
kernel/fork.c | 3
kernel/ptrace.c | 14
kernel/utrace.c | 2427 ++++++++++++++++++++++++++++++++++++++
11 files changed, 3831 insertions(+), 2 deletions(-)
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- linux-2.6-utrace.patch 18 Dec 2009 09:56:47 -0000 1.120
+++ linux-2.6-utrace.patch 11 Jan 2010 19:38:47 -0000 1.121
@@ -30,27 +30,27 @@ Signed-off-by: Roland McGrath <roland at re
fs/proc/array.c | 3 +
include/linux/sched.h | 5 +
include/linux/tracehook.h | 87 ++-
- include/linux/utrace.h | 694 +++++++++++
+ include/linux/utrace.h | 692 +++++++++++
init/Kconfig | 9 +
kernel/Makefile | 1 +
kernel/fork.c | 3 +
kernel/ptrace.c | 14 +
kernel/utrace.c | 2427 +++++++++++++++++++++++++++++++++++++
- 11 files changed, 3833 insertions(+), 2 deletions(-)
+ 11 files changed, 3831 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
-index ab8300f..95f59e4 100644
+index 325cfd1..a45e4e6 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
-@@ -9,7 +9,7 @@
- DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
- kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
- procfs-guide.xml writing_usb_driver.xml networking.xml \
-- kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
-+ kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \
- gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
+@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml mcabook.xml de
genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
mac80211.xml debugobjects.xml sh.xml regulator.xml \
+ alsa-driver-api.xml writing-an-alsa-driver.xml \
+- tracepoint.xml media.xml
++ tracepoint.xml utrace.xml media.xml
+
+ ###
+ # The build process is as follows (targets):
diff --git a/Documentation/DocBook/utrace.tmpl b/Documentation/DocBook/utrace.tmpl
new file mode 100644
index ...e149f49 100644
@@ -648,7 +648,7 @@ index ...e149f49 100644
+
+</book>
diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 822c2d5..9069c91 100644
+index f560325..2805b44 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -82,6 +82,7 @@
@@ -659,7 +659,7 @@ index 822c2d5..9069c91 100644
#include <linux/swapops.h>
#include <asm/pgtable.h>
-@@ -189,6 +190,8 @@ static inline void task_state(struct seq
+@@ -194,6 +195,8 @@ static inline void task_state(struct seq
cred->uid, cred->euid, cred->suid, cred->fsuid,
cred->gid, cred->egid, cred->sgid, cred->fsgid);
@@ -669,10 +669,10 @@ index 822c2d5..9069c91 100644
if (p->files)
fdt = files_fdtable(p->files);
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 6c8928b..139d300 100644
+index 44718d4..eb64e91 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -1393,6 +1393,11 @@ struct task_struct {
+@@ -1403,6 +1403,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -924,10 +924,10 @@ index c78b2f4..71fa250 100644
diff --git a/include/linux/utrace.h b/include/linux/utrace.h
new file mode 100644
-index ...c3036c8 100644
+index ...f251efe 100644
--- /dev/null
+++ b/include/linux/utrace.h
-@@ -0,0 +1,694 @@
+@@ -0,0 +1,692 @@
+/*
+ * utrace infrastructure interface for debugging user processes
+ *
@@ -1053,8 +1053,6 @@ index ...c3036c8 100644
+static inline void utrace_init_task(struct task_struct *child)
+{
+}
-+{
-+}
+
+static inline void task_utrace_proc_status(struct seq_file *m,
+ struct task_struct *p)
@@ -1623,7 +1621,7 @@ index ...c3036c8 100644
+
+#endif /* linux/utrace.h */
diff --git a/init/Kconfig b/init/Kconfig
-index eb4b337..140e636 100644
+index a23da9f..9bbc195 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -310,6 +310,15 @@ config AUDIT_TREE
@@ -1643,10 +1641,10 @@ index eb4b337..140e636 100644
choice
diff --git a/kernel/Makefile b/kernel/Makefile
-index d7c13d2..263bb19 100644
+index 864ff75..8a0185e 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
-@@ -68,6 +68,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
+@@ -69,6 +69,7 @@ obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o
@@ -1655,10 +1653,10 @@ index d7c13d2..263bb19 100644
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
obj-$(CONFIG_GCOV_KERNEL) += gcov/
diff --git a/kernel/fork.c b/kernel/fork.c
-index 166b8c4..3ac952e 100644
+index 5b2959b..1e050f2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -152,6 +152,7 @@ void free_task(struct task_struct *tsk)
+@@ -153,6 +153,7 @@ void free_task(struct task_struct *tsk)
free_thread_info(tsk->stack);
rt_mutex_debug_task_free(tsk);
ftrace_graph_exit_task(tsk);
@@ -1666,7 +1664,7 @@ index 166b8c4..3ac952e 100644
free_task_struct(tsk);
}
EXPORT_SYMBOL(free_task);
-@@ -1018,6 +1019,8 @@ static struct task_struct *copy_process(
+@@ -1023,6 +1024,8 @@ static struct task_struct *copy_process(
if (!p)
goto fork_out;
linux-2.6.30-hush-rom-warning.patch:
setup-res.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
Index: linux-2.6.30-hush-rom-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.30-hush-rom-warning.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- linux-2.6.30-hush-rom-warning.patch 3 Aug 2009 16:48:20 -0000 1.2
+++ linux-2.6.30-hush-rom-warning.patch 11 Jan 2010 19:38:48 -0000 1.3
@@ -1,27 +1,41 @@
-diff -up linux-2.6.30.noarch/drivers/pci/setup-res.c.jx linux-2.6.30.noarch/drivers/pci/setup-res.c
---- linux-2.6.30.noarch/drivers/pci/setup-res.c.jx 2009-07-27 17:56:13.000000000 -0400
-+++ linux-2.6.30.noarch/drivers/pci/setup-res.c 2009-07-27 17:58:25.000000000 -0400
-@@ -101,6 +101,7 @@ int pci_claim_resource(struct pci_dev *d
+From fe97564a6c40c1dd1e760ea9543d63709907d577 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at treachery.i.jkkm.org>
+Date: Mon, 11 Jan 2010 08:31:34 -0500
+Subject: linux-2.6.30-hush-rom-warning.patch
+
+---
+ drivers/pci/setup-res.c | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
+index 7d678bb..5acac72 100644
+--- a/drivers/pci/setup-res.c
++++ b/drivers/pci/setup-res.c
+@@ -95,6 +95,7 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
struct resource *res = &dev->resource[resource];
struct resource *root;
int err;
+ const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
root = pci_find_parent_resource(dev, res);
+ if (!root) {
+@@ -104,9 +105,13 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
+ }
-@@ -108,8 +109,13 @@ int pci_claim_resource(struct pci_dev *d
- if (root != NULL)
- err = request_resource(root, res);
+ err = request_resource(root, res);
+- if (err)
+- dev_err(&dev->dev,
+- "address space collision: %pR already in use\n", res);
++ if (err)
++ if (resource == 6) /* KERN_INFO on ROM. */
++ dev_info(&dev->dev,
++ "address space collision: %pR already in use\n", res);
++ else
++ dev_err(&dev->dev,
++ "address space collision: %pR already in use\n", res);
-- if (err) {
-- const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
-+ if (err && resource == 6) {
-+ dev_info(&dev->dev, "BAR %d: %s of %s %pR\n",
-+ resource,
-+ root ? "address space collision on" :
-+ "no parent found for",
-+ dtype, res);
-+ } else if (err) {
- dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
- resource,
- root ? "address space collision on" :
+ return err;
+ }
+--
+1.6.5.2
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1110
retrieving revision 1.1111
diff -u -p -r1.1110 -r1.1111
--- sources 11 Jan 2010 16:41:43 -0000 1.1110
+++ sources 11 Jan 2010 19:38:48 -0000 1.1111
@@ -1,2 +1,2 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-6bd3c5fea1e88bb4d0948ec3688bd8f6 patch-2.6.32.3.bz2
+35defe2029ae5652efa74c6c28a5d0b9 patch-2.6.33-rc3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1023
retrieving revision 1.1024
diff -u -p -r1.1023 -r1.1024
--- upstream 11 Jan 2010 16:41:43 -0000 1.1023
+++ upstream 11 Jan 2010 19:38:49 -0000 1.1024
@@ -1,2 +1,2 @@
linux-2.6.32.tar.bz2
-patch-2.6.32.3.bz2
+patch-2.6.33-rc3.bz2
--- linux-2.6-autoload-wmi.patch DELETED ---
--- linux-2.6-defaults-alsa-hda-beep-off.patch DELETED ---
--- linux-2.6-intel-agp-clear-gtt.patch DELETED ---
--- linux-2.6-nfsd4-proots.patch DELETED ---
--- linux-2.6-pci-cacheline-sizing.patch DELETED ---
--- patch-2.6.32.3.bz2.sign DELETED ---
--- via-hwmon-temp-sensor.patch DELETED ---
More information about the scm-commits
mailing list