rpms/kernel/devel linux-2.6-suspend-memhotplug-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.1880, 1.1881

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28096

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-suspend-memhotplug-oops.patch 
Log Message:
Fix software suspend on kernels without memory hotplug. (#178339)



linux-2.6-suspend-memhotplug-oops.patch:
 page_alloc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-suspend-memhotplug-oops.patch ---

https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178339

pageset_cpuup_callback() is marked __meminit, but software suspend
needs it.  Unfortunatly, if you don't have CONFIG_MEMORY_HOTPLUG set,
the __meminit translates to __init, resulting in this...

Freezing cpus ...
int3: 0000 [1] SMP
last sysfs file: /power/state
CPU 0
Modules linked in: radeon drm ipv6 ppdev autofs4 rfcomm l2cap sunrpc
ip_conntrack_netbios_ns ipt_REJECT xt_state ip_conntrack nfnetlink xt_tcpudp
iptable_filter ip_tables x_tables video battery ac lp parport_pc parport nvram
hci_usb bluetooth ehci_hcd ohci1394 ieee1394 uhci_hcd snd_hda_intel saa7134
snd_hda_codec video_buf snd_seq_dummy compat_ioctl32 v4l2_common v4l1_compat
snd_seq_oss snd_seq_midi_event ir_kbd_i2c snd_seq e100 snd_seq_device ir_common
snd_pcm_oss snd_mixer_oss mii videodev snd_pcm snd_timer snd i2c_i801 hw_random
soundcore i2c_core snd_page_alloc dm_snapshot dm_zero dm_mirror dm_mod ext3 jbd
ahci libata sd_mod scsi_mod
Pid: 3373, comm: pm-suspend Not tainted 2.6.15-1.1872_FC5 #1
RIP: 0010:[<ffffffff80558435>] <ffffffff80558435>{pageset_cpuup_callback+1}
RSP: 0018:ffff81002802fdb0  EFLAGS: 00000286
RAX: 0000000000000001 RBX: ffffffff803c8560 RCX: 0000000000000001
RDX: 0000000000000001 RSI: 0000000000000005 RDI: ffffffff803c8560
RBP: 0000000000000001 R08: ffffffff8053cae8 R09: 0000000000000004
R10: 0000000000000002 R11: 0000000000000004 R12: 0000000000000005
R13: 0000000000000003 R14: 0000000000000003 R15: ffff81002802ff50
FS:  00002aee15c8cd30(0000) GS:ffffffff8051a000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 00002aee19023000 CR3: 00000000292a1000 CR4: 00000000000006e0
Process pm-suspend (pid: 3373, threadinfo ffff81002802e000, task
+ffff810026b38040)
Stack: ffffffff80341296 0000000000000001 0000000000000001 0000000000000003
       ffffffff8014b803 ffff81002802fe38 ffffffff80146641 0000000000000296
       0000000000000296 0000000000000000
Call Trace: <ffffffff80341296>{notifier_call_chain+28}
       <ffffffff8014b803>{cpu_down+96} <ffffffff80146641>{remove_wait_queue+17}
       <ffffffff80255149>{vt_waitactive+150}
<ffffffff801535e3>{disable_nonboot_cpus+82}
       <ffffffff80150625>{enter_state+161} <ffffffff80150825>{state_store+113}
       <ffffffff801bf5c3>{sysfs_write_file+201}
+<ffffffff80180d38>{vfs_write+206}
       <ffffffff801812ea>{sys_write+69} <ffffffff8010a906>{system_call+126}

Code: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc


Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.15.noarch/mm/page_alloc.c~	2006-01-27 15:40:35.000000000 -0500
+++ linux-2.6.15.noarch/mm/page_alloc.c	2006-01-27 15:40:40.000000000 -0500
@@ -1939,7 +1939,7 @@ static inline void free_zone_pagesets(in
 	}
 }
 
-static int __meminit pageset_cpuup_callback(struct notifier_block *nfb,
+static int pageset_cpuup_callback(struct notifier_block *nfb,
 		unsigned long action,
 		void *hcpu)
 {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -r1.1880 -r1.1881
--- kernel-2.6.spec	27 Jan 2006 19:36:15 -0000	1.1880
+++ kernel-2.6.spec	27 Jan 2006 20:44:32 -0000	1.1881
@@ -358,6 +358,7 @@
 Patch1850: linux-2.6-mv643xx-compile-fix.patch
 Patch1860: linux-2.6-net-fix-iptables.patch
 Patch1870: linux-2.6-net-slab-corruption.patch
+Patch1880: linux-2.6-suspend-memhotplug-oops.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-idescsi-warning.patch
@@ -849,6 +850,8 @@
 %patch1860 -p1
 # Fix netlayer slab corruption
 %patch1870 -p1
+# Fix software suspend on kernels without memory hotplug.
+%patch1880 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1373,6 +1376,7 @@
 %changelog
 * Fri Jan 27 2006 Dave Jones <davej at redhat.com>
 - New userspace audit message types.
+- Fix software suspend on kernels without memory hotplug. (#178339)
 
 * Thu Jan 26 2006 Dave Jones <davej at redhat.com>
 - Fix building of kdump kernels.