View previous topic :: View next topic |
Author |
Message |
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Thu Jun 17, 2004 1:01 am Post subject: |
|
|
Quote: | Reversed (or previously applied) patch detected! Assume -R? [n] |
The patch contains changes that have already been made in the sources being patched. For example, if you try to apply a laptop mode patch to kernel 2.6.6 (which includes laptop mode already) then you should get a message like that. Another example would be patching gentoo-dev-souces with a bootsplash patch (bootsplash is already in gentoo-dev-sources).
The patch was not created for the sources you are patching so your results may vary! _________________ Zac |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Thu Jun 17, 2004 2:00 am Post subject: |
|
|
Yeah, I figured that out by downloading the 2.6.6 sources from kernel.org. Now it patches fine.
It is mostly working. It will suspend when I hit my power button. But, when I try to resume, it resumes, and the minute kde starts in suspends again. Any clues? _________________ Soar with God!
David |
|
Back to top |
|
|
dan2003 Apprentice
Joined: 11 May 2003 Posts: 258 Location: somewhere near london, UK
|
Posted: Thu Jun 17, 2004 9:54 pm Post subject: |
|
|
I'm a tad confused.. This is different to suspend-to-disk yes? Cos i had suspend to disk working and resuming succesfully earlier with 2.6.7-ck1 but now i have managed to brake it.
With dri working it doesnt even bring X back, with Dri disabled X comes back and the clock is ticking over (i have seconds visible in kde) but the mouse and kbd dont work (interesting how the usb optical mouse does light back up now tho - it wouldnt do that without reloading ohci-hcd earlier).
Basically i have added bootsplash to ck1 but this appears not to be the cause, so i'm left thinking it must be Xorg which i upgraded too to make IGP320m Dri work which it now does.
My working config earlier was with Xfree 4.3.0. Note it was very quick and didnt have all these scripts. I could simply right click on the battery app and click hibernate. I estimate it took about 10-15 secs to hibernate and about 30 to boot back up.
I did however have to reload both usb and net modules manually after. And now i can see loads of oops type code scroll up the screen on resume says "Something bad happened" !! to do with usb.
This is with a HP Compaq NX9005 XP2000, 256Mb ram, IGP320m gpu.
Hmm.. just tried a suspend / resume cycle from a tty after stoppping X and it still comes back without keyboard working :/
[Edit]
I timed it, suspend = 12 secs
resume = 32 secs, but once its all back the mouse and keybd are dead (atm)
I'm gonna try this swsusp2,
maybe not, theres not a 2.6.7 version |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Fri Jun 18, 2004 1:13 am Post subject: |
|
|
Jerrac wrote: | It will suspend when I hit my power button. But, when I try to resume, it resumes, and the minute kde starts in suspends again. Any clues? |
I have had this problem because several (more than one) power management events were generated when I pressed the power button. There are still some power button events left over after the resume. You need to account for the extra events somehow. Maybe if you put acpid (or apmd) in the SWSUSP_RESTART_SERVICES variable of /etc/suspend.conf that will flush those events before the suspend.
dan2003 wrote: | I'm a tad confused.. This is different to suspend-to-disk yes? |
Software suspend is all in the kernel while some other mechanisms rely on firmware.
Quote: | Hmm.. just tried a suspend / resume cycle from a tty after stoppping X and it still comes back without keyboard working :/ |
Build those drivers as modules, unload them before suspend, and reload them after resume. _________________ Zac |
|
Back to top |
|
|
tuxlover Apprentice
Joined: 21 Oct 2003 Posts: 297 Location: weltweit
|
Posted: Fri Jun 18, 2004 3:03 pm Post subject: |
|
|
dan2003 wrote: | I'm a tad confused.. This is different to suspend-to-disk yes? |
swsusp2 is a complete rewrite of swsusp(1), the old software suspend of the linux kernel. As already mentioned, you might have a vendor-specific swsusp in your laptop already (although unlikely because uncommon today).
dan2003 wrote: | with Dri disabled X comes back and the clock is ticking over (i have seconds visible in kde) |
What do you mean by "ticking over"? Is it too fast, or too slow? There are some options for taking care of clock/time problems in /etc/sysconfig/suspend.conf. Take a look at them.
dan2003 wrote: | but the mouse and kbd dont work (interesting how the usb optical mouse does light back up now tho - it wouldnt do that without reloading ohci-hcd earlier). |
My experience shows that simply making hotplug restart (also described in my howto) makes mouse and keyboard work.
dan2003 wrote: | so i'm left thinking it must be Xorg |
swsusp2 should work with Xorg (I use it, too). |
|
Back to top |
|
|
noneckturtle n00b
Joined: 29 Jun 2003 Posts: 12
|
Posted: Tue Jun 22, 2004 1:36 pm Post subject: |
|
|
I got most of swsusp2 working but am worried about a couple of issues.
1. When I restarted after using the hibernate script the root partition /dev/hda9 was mounted read-only. The boot partition /dev/hda2 was mounted read-write.
When I rebooted and tried another suspend everything worked fine.
2. When I place pcmcia in the restart_services location of the suspend.config I got:
rc-scripts: Usage: pcmcia {start|stop|restart}
pcmcia without arguments for help
How do I get this to work?
kernel = 2.6.5-r1 gentoo-dev-sources
e2fsprogs = version 1.34
EXT3 is compiled into the kernel |
|
Back to top |
|
|
genstef Retired Dev
Joined: 13 Jun 2004 Posts: 668 Location: M/Bay/Germany
|
Posted: Tue Jun 22, 2004 2:42 pm Post subject: |
|
|
is there a similar howto for suspend-to-ram?
I think swsusp2 is much too slow for a laptop that is really in use.
I got suspend-to-ram working and it should work for radeon cards with this howto: http://www.doesi.gmxhome.de/linux/tm800s3/s3.html
But there is an issue i have that my network card stops working from time-to-time after a suspend. I dont know where to post on the issue as there is no suspend-to-ram mailing list. where should i post it? |
|
Back to top |
|
|
tuxlover Apprentice
Joined: 21 Oct 2003 Posts: 297 Location: weltweit
|
Posted: Tue Jun 22, 2004 5:14 pm Post subject: |
|
|
noneckturtle wrote: | 2. When I place pcmcia in the restart_services location of the suspend.config I got:
rc-scripts: Usage: pcmcia {start|stop|restart}
pcmcia without arguments for help
How do I get this to work? |
I don't know what the problem is really, but as a workaround you can edit /etc/suspend.conf and put a call to /etc/init.d/pcmcia stop in
Code: | SWSUSP_START_PROGS_BEFORE_SUSPEND="" |
and, analogously, /etc/init.de/pcmcia start in
Code: | SWSUSP_START_PROGS_AFTER_RESUME="" |
You probably need to use strange quoting, or you need to put your pcmcia start/stop calls in scripts, and put calls to these scripts in swsusp_start_progs_before/after_resume. I.e. it will *not* work if you simply spell out swsusp_start_progs_before_resume="/etc/init.d/pcmcia stop".
You can also just restart pcmcia in swsusp_start_progs_after_resume, but that will not unload any modules before suspend, which might be necessary.
genstefan wrote: | I think swsusp2 is much too slow for a laptop that is really in use. |
I think swsusp and suspend to ram are two different things. swsusp is more useful if you plan to leave your computer off for a longer time, because it is, as you said, quite slow (but shouldn't be much slower than windows' hibernation mode...?)
Quote: | But there is an issue i have [...] where should i post it? |
You could make a howto and use it to post your own problems seriously.
Do you have an acer tm 80x? Then you could also try the acer tm 80x support thread (which, unfortunately, has gotten so long that nobody really pays very much attention, or your posts get "lost" quickly). |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Tue Jun 22, 2004 8:30 pm Post subject: |
|
|
I have got it working pretty well now. But when I resume my keyboard and mouse/touchpad will not work at all. I have all the modules in the modprobe -l list in modules.autoload.d/kernel-2.6. So suspend auto un/loads them. Any suggestions? Thanks! _________________ Soar with God!
David |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Wed Jun 23, 2004 12:29 am Post subject: |
|
|
noneckturtle wrote: |
2. When I place pcmcia in the restart_services location of the suspend.config I got:
rc-scripts: Usage: pcmcia {start|stop|restart}
pcmcia without arguments for help
|
I had this same problem. There is a bug in the hibernate script version 0.18 that causes the start|stop arguments to be uppercased. Here is my patch:
Code: | --- hibernate-0.18 2004-05-08 01:04:39.000000000 -0700
+++ hibernate 2004-06-16 01:08:57.000000000 -0700
@@ -314,6 +314,13 @@
# gentoo use this
echo -e "\033[1;33m$services_to_execute\033[0m" | $LOGCMD > $VERBOSE
+ if [ "$startstop" = "START" ] ; then
+ startstop="start"
+ fi
+ if [ "$startstop" = "STOP" ] ; then
+ startstop="stop"
+ fi
+
if [ "$startstop" = "stop" ] ; then
# start services - reverse the order in which the scripts are called
for script in $services_to_execute ; do |
Jerrac wrote: | But when I resume my keyboard and mouse/touchpad will not work at all. |
Did you put hotplug in the SWSUSP_RESTART_SERVICES variable of /etc/suspend.conf as suggested by tuxlover? That does "input hotplugging".
dan2003 wrote: | theres not a 2.6.7 version |
I'm using software-suspend-2.0.0.88-for-2.6.7 now and it seems to work well. _________________ Zac |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Wed Jun 23, 2004 1:23 am Post subject: |
|
|
zmedico wrote: |
Jerrac wrote: | But when I resume my keyboard and mouse/touchpad will not work at all. |
Did you put hotplug in the SWSUSP_RESTART_SERVICES variable of /etc/suspend.conf as suggested by tuxlover? That does "input hotplugging".
|
Yes, I did. I have SWSUSP_RESTART_SERVICES="alsasound hotplug"
Do you want to see my entire suspend.conf? _________________ Soar with God!
David |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Wed Jun 23, 2004 4:34 am Post subject: |
|
|
Jerrac wrote: | Do you want to see my entire suspend.conf? |
No, not really.
Information about your specific hardware and whether or not you built the drivers as modules is probably the most useful. I had to build the psmouse driveras a module (Device Drivers->Input device support->PS/2 mouse) CONFIG_MOUSE_PS2=m and have it unloaded/reloaded. Maybe if you compile the kernel with CONFIG_SERIO=m (Device Drivers->Character Devices->Serial Devices) you can unload/reload that to get the keyboard going. If you have to recompile it gives you an excuse to upgrade to 2.6.7!
I got that serio idea because I saw this line in dmesg: Quote: | input: AT Translated Set 2 keyboard on isa0060/serio0 |
_________________ Zac
Last edited by zmedico on Wed Jun 23, 2004 5:02 am; edited 1 time in total |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Wed Jun 23, 2004 5:00 am Post subject: |
|
|
Here are all the modules I get with modprobe -l.
Quote: | /lib/modules/2.6.6/kernel/sound/drivers/mpu401/snd-mpu401-uart.ko
/lib/modules/2.6.6/kernel/sound/core/snd.ko
/lib/modules/2.6.6/kernel/sound/core/snd-timer.ko
/lib/modules/2.6.6/kernel/sound/core/seq/snd-seq.ko
/lib/modules/2.6.6/kernel/sound/core/seq/oss/snd-seq-oss.ko
/lib/modules/2.6.6/kernel/sound/core/seq/snd-seq-midi.ko
/lib/modules/2.6.6/kernel/sound/core/seq/snd-seq-midi-event.ko
/lib/modules/2.6.6/kernel/sound/core/seq/snd-seq-device.ko
/lib/modules/2.6.6/kernel/sound/core/snd-rawmidi.ko
/lib/modules/2.6.6/kernel/sound/core/snd-pcm.ko
/lib/modules/2.6.6/kernel/sound/core/snd-page-alloc.ko
/lib/modules/2.6.6/kernel/sound/core/oss/snd-pcm-oss.ko
/lib/modules/2.6.6/kernel/sound/core/oss/snd-mixer-oss.ko
/lib/modules/2.6.6/kernel/sound/pci/snd-intel8x0.ko
/lib/modules/2.6.6/kernel/sound/pci/ali5451/snd-ali5451.ko
/lib/modules/2.6.6/kernel/sound/pci/ac97/snd-ac97-codec.ko
/lib/modules/2.6.6/kernel/arch/i386/mki-adapter26/mki-adapter.ko
/lib/modules/2.6.6/kernel/arch/i386/kernel/cpu/cpufreq/acpi.ko
/lib/modules/2.6.6/kernel/drivers/usb/class/usblp.ko
/lib/modules/2.6.6/kernel/drivers/usb/input/usbhid.ko
/lib/modules/2.6.6/kernel/drivers/usb/core/usbcore.ko
/lib/modules/2.6.6/kernel/drivers/usb/storage/usb-storage.ko
/lib/modules/2.6.6/kernel/drivers/usb/host/uhci-hcd.ko
/lib/modules/2.6.6/kernel/drivers/usb/host/ehci-hcd.ko
/lib/modules/2.6.6/kernel/drivers/net/wireless/prism54/prism54.ko
/lib/modules/2.6.6/kernel/drivers/net/dummy.ko
/lib/modules/2.6.6/kernel/drivers/pcmcia/yenta_socket.ko
/lib/modules/2.6.6/kernel/drivers/pcmcia/pcmcia_core.ko
/lib/modules/2.6.6/kernel/drivers/pcmcia/ds.ko
/lib/modules/2.6.6/kernel/drivers/acpi/thermal.ko
/lib/modules/2.6.6/kernel/drivers/acpi/processor.ko
/lib/modules/2.6.6/kernel/drivers/acpi/fan.ko
/lib/modules/2.6.6/kernel/drivers/acpi/button.ko
/lib/modules/2.6.6/kernel/drivers/acpi/battery.ko
/lib/modules/2.6.6/kernel/drivers/acpi/ac.ko
|
That is all the modules right?
As for my hard ware I have a viao frv37 laptop. Uses an alps pointing device. _________________ Soar with God!
David |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Wed Jun 23, 2004 5:04 am Post subject: |
|
|
Jerrac wrote: |
That is all the modules right?
|
If you do CONFIG_SERIO=m they you'll have a module called "serial". If you do CONFIG_MOUSE_PS2=m then you'll have a module called "psmouse". You currently don't have either one. You'll have to recompile because they are statically linked.
BTW- I'm not sure if you mouse is PS/2. You probably know already if it works with gpm/X. _________________ Zac
Last edited by zmedico on Wed Jun 23, 2004 5:10 am; edited 1 time in total |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Wed Jun 23, 2004 5:08 am Post subject: |
|
|
I have a question that I would rather search for, but I am unsure what terms to use. So I will ask it here.
If I go into my current config with menuconfig, change something to M, can I just make modules_install without haveing to recompile the kernel?
*will try the keyboard/mouse modules tomorrow* _________________ Soar with God!
David |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Wed Jun 23, 2004 5:14 am Post subject: |
|
|
Jerrac wrote: | If I go into my current config with menuconfig, change something to M, can I just make modules_install without haveing to recompile the kernel?* |
If you go from N to M then it may be possible to do something like that (modules_install doesn't compile modules, see the modules "Hello World" above). Going from Y to M is a different story because the statically linked driver would need to be disabled somehow (kernel parameters or system calls). _________________ Zac |
|
Back to top |
|
|
hugelmopf n00b
Joined: 02 May 2004 Posts: 28 Location: Dresden (Germany)
|
Posted: Wed Jun 23, 2004 7:59 am Post subject: |
|
|
On applying the patch software-suspend-2.0.0.88-for-2.6.7.tar.bz2 to my gentoo-dev-2.6.7-kernel I get different prompts saying something like:
"Reversed (or previously applied) patch detected! Assume -R? [n]"
"File exists, overwrite...?" (These are not the exact words, forgot to copy them).
One example-file for this to happen is Kconfig.
Now I understand what that means (see earlier post), but what should I choose, if I want to keep using gentoo-dev-sources. Is that possible at all? |
|
Back to top |
|
|
tuxlover Apprentice
Joined: 21 Oct 2003 Posts: 297 Location: weltweit
|
Posted: Wed Jun 23, 2004 9:35 am Post subject: |
|
|
hugelmopf wrote: | "Reversed (or previously applied) patch detected! Assume -R? [n]"
"File exists, overwrite...?" (These are not the exact words, forgot to copy them).
One example-file for this to happen is Kconfig.
[..] if I want to keep using gentoo-dev-sources. Is that possible at all? |
I'm not using gentoo-dev-sources right now, so I don't know. But concerning the "reversed" patches, you should take a look at the files that it doesn't want to patch, and compare it with the patch manually. You should definitely answer the question "Assume -R? [n]" with the default, [n]. (which will leave your kernel as it is, as far as I understand it)
You can always try to compile the kernel and see if it runs. If no filesystem stuff is involved, it should at least not damage your system.
(Disclaimer: Any crash can damage your filesystem)
nebenbei, hugelmopf: ich bin auch aus Dresden (wohne zur Zeit aber nicht da) |
|
Back to top |
|
|
noneckturtle n00b
Joined: 29 Jun 2003 Posts: 12
|
Posted: Wed Jun 23, 2004 12:05 pm Post subject: |
|
|
I'm still getting the issue with the root filesystem being mounted read-only. (See previous post) This occurs about 1 in 3 times after running the hibernate script and then powering back on. If I reboot, the filesystem repairs itself (ext3) but the time lost makes swsusp2 a waste.
Anyone got any ideas?
My hdparm optimisations in /etc/conf.d/hdparm are:
disc0_args="-d1 -A1 -m16 -u1 -a64 -X udma5 -c3"
I have SWSUSP_DISABLE_HW_DISK_CACHE set to "/dev/hda" |
|
Back to top |
|
|
neuron Advocate
Joined: 28 May 2002 Posts: 2371
|
Posted: Wed Jun 23, 2004 12:06 pm Post subject: |
|
|
did anyone get the 2.6.7 patch to apply?
It does not apply cleanly to 2.6.7 at all (vanilla) for me... |
|
Back to top |
|
|
genstef Retired Dev
Joined: 13 Jun 2004 Posts: 668 Location: M/Bay/Germany
|
Posted: Wed Jun 23, 2004 12:13 pm Post subject: |
|
|
i got it to apply together with bootsplash and win4lin. |
|
Back to top |
|
|
Jerrac Tux's lil' helper
Joined: 22 Jun 2003 Posts: 111
|
Posted: Wed Jun 23, 2004 8:05 pm Post subject: |
|
|
I just compiled the mouse drivers as modules. Made the kernel and modules install. Copied everything over to boot. Restarted. It gives me the little "loading linux........" thing, and then restarts my computer.
What could cause that? I did the 2.6.6 kernel since the 2.6.7 wouldn't patch cleanly.
[edit]I just redid the kernel and modules. Now it just hangs at the loading linux......[/edit] _________________ Soar with God!
David |
|
Back to top |
|
|
zmedico Developer
Joined: 02 Jan 2004 Posts: 352 Location: California USA
|
Posted: Thu Jun 24, 2004 1:01 am Post subject: |
|
|
neuron wrote: | It does not apply cleanly to 2.6.7 at all (vanilla) for me... |
It works fine for me, just like the 2.6.6 patch set did. I'll post the md5sum again to make sure we're talking about the same thing.
b7ebb63885b98d5e7ee0deeef8537f02 software-suspend-2.0.0.88-for-2.6.7.tar.bz2
I patched in an analogous way to my previous post.
tuxlover wrote: | But concerning the "reversed" patches, you should take a look at the files that it doesn't want to patch, and compare it with the patch manually. You should definitely answer the question "Assume -R? [n]" with the default, [n]. (which will leave your kernel as it is, as far as I understand it) |
That's how I understand it too. However, things get complex for example if there are two different versions of bootsplash in gentoo-dev-sources and swsusp2 patches. Interaction between patches can also increase complexity, for example, if swsusp2 interacts with bootsplash. In these situations it may be best to pick out the specific patches you want from gentoo-dev-sources and swsusp2 and not apply the ones that would be redundant. You could get the gentoo-dev-sources patches from one of the genpatches-* tarballs in your distfiles directory.
Jerrac wrote: | it just hangs at the loading linux...... |
Are you using SWSUSP_UNLOAD_MODULES_BEFORE_SUSPEND="auto" or what? I like to use auto but if you're having problems it might be more stable if you use "yes".
If that doesn't help then you could try following the debugging instructions in Documentation/power/swsusp2.txt of the kernel source tree. Then you may be able to see an oops and find out what's causing it.
When I used the acpi button module with acpid to trigger hibernation with my 2.6.6 kernel it caused a few oppses. It works fine with my 2.6.7 kernel though.
noneckturtle wrote: | root filesystem being mounted read-only |
That's odd. Maybe you can get a clue if you follow the debugging instructions. I would try a new kernel of the latest version before I resort to debugging. Don't forget to compile in swsusp2 debugging support! _________________ Zac |
|
Back to top |
|
|
tuxlover Apprentice
Joined: 21 Oct 2003 Posts: 297 Location: weltweit
|
Posted: Thu Jun 24, 2004 11:08 am Post subject: |
|
|
zmedico wrote: | Jerrac wrote: | it just hangs at the loading linux...... |
Are you using SWSUSP_UNLOAD_MODULES_BEFORE_SUSPEND="auto" or what? I like to use auto but if you're having problems it might be more stable if you use "yes". |
I had the impression that Jerrac's problem is not related to using swsusp at all, he's just rebooting with the new kernel...? |
|
Back to top |
|
|
stefanpropehan n00b
Joined: 17 Jun 2004 Posts: 15 Location: Germany - Berlin
|
Posted: Thu Jun 24, 2004 1:14 pm Post subject: |
|
|
has anybody patched the gentoo-dev-sources-2.6.7-r5 kernel?
I get the following patch result when i patch the kernel described in the post of zmedico
Code: |
patching file Makefile
patching file init/main.c
patching file mm/memory.c
patching file mm/swapfile.c
patching file kernel/printk.c
patching file kernel/kallsyms.c
patching file kernel/exit.c
patching file kernel/sched.c
patching file kernel/module.c
patching file kernel/signal.c
patching file kernel/sysctl.c
Hunk #2 succeeded at 520 (offset 3 lines).
Hunk #3 succeeded at 2202 (offset 11 lines).
patching file scripts/Makefile
patching file fs/proc/proc_misc.c
patching file include/linux/sysctl.h
Hunk #1 FAILED at 133.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/sysctl.h.rej
patching file include/linux/console.h
patching file drivers/serial/8250.c
patching file drivers/char/sn_serial.c
patching file drivers/char/keyboard.c
Hunk #1 succeeded at 40 with fuzz 2.
Hunk #2 FAILED at 1062.
1 out of 2 hunks FAILED -- saving rejects to file drivers/char/keyboard.c.rej
patching file mm/hugetlb.c
patching file kdb/modules/Makefile
patching file kdb/modules/kdbm_vm.c
patching file kdb/modules/kdbm_task.c
patching file kdb/modules/kdbm_pg.c
patching file kdb/Makefile
patching file kdb/kdbsupport.c
patching file kdb/kdbmain.c
patching file kdb/kdb_io.c
patching file kdb/kdb_id.c
patching file kdb/kdb_cmds
patching file kdb/kdb_bt.c
patching file kdb/kdb_bp.c
patching file kdb/ChangeLog
patching file include/linux/kdbprivate.h
patching file include/linux/kdb.h
patching file include/linux/dis-asm.h
patching file Documentation/kdb/slides
patching file Documentation/kdb/kdb_ss.man
patching file Documentation/kdb/kdb_sr.man
patching file Documentation/kdb/kdb_rd.man
patching file Documentation/kdb/kdb.mm
patching file Documentation/kdb/kdb_md.man
patching file Documentation/kdb/kdb_ll.man
patching file Documentation/kdb/kdb_env.man
patching file Documentation/kdb/kdb_bt.man
patching file Documentation/kdb/kdb_bp.man
patching file Documentation/kdb/dump.txt
patching file Documentation/kdb/kdb_ps.man
patching file include/asm-i386/ptrace.h
patching file include/asm-i386/mach-default/irq_vectors.h
patching file include/asm-i386/kmap_types.h
patching file arch/i386/Makefile
patching file arch/i386/kernel/vmlinux.lds.S
patching file arch/i386/kernel/traps.c
patching file arch/i386/kernel/smp.c
patching file arch/i386/kernel/smpboot.c
patching file arch/i386/kernel/reboot.c
patching file arch/i386/kernel/nmi.c
patching file arch/i386/kernel/io_apic.c
patching file arch/i386/kernel/i8259.c
patching file arch/i386/kernel/entry.S
patching file arch/i386/Kconfig
patching file kdb/modules/kdbm_x86.c
patching file include/asm-i386/kdbprivate.h
patching file include/asm-i386/kdb.h
patching file arch/i386/kdb/pc_keyb.h
patching file arch/i386/kdb/Makefile
patching file arch/i386/kdb/kdbasupport.c
patching file arch/i386/kdb/kdba_io.c
patching file arch/i386/kdb/kdba_id.c
patching file arch/i386/kdb/kdba_bt.c
patching file arch/i386/kdb/kdba_bp.c
patching file arch/i386/kdb/i386-dis.c
patching file arch/i386/kdb/ChangeLog
patching file include/asm-i386/bfd.h
patching file include/asm-i386/ansidecl.h
patching file arch/i386/kdb/kdb_cmds
patching file drivers/char/keyboard.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/char/keyboard.c.rej
patching file drivers/char/n_tty.c
Hunk #1 succeeded at 1004 with fuzz 2 (offset 10 lines).
Hunk #2 succeeded at 1097 (offset 10 lines).
patching file drivers/char/vt.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file drivers/char/vt.c.rej
patching file drivers/video/Kconfig
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/Kconfig.rej
patching file drivers/video/Makefile
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/Makefile.rej
The next patch would create the file drivers/video/bootsplash/Kconfig,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/Kconfig.rej
The next patch would create the file drivers/video/bootsplash/Makefile,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/Makefile.rej
The next patch would create the file drivers/video/bootsplash/bootsplash.c,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/bootsplash.c.rej
The next patch would create the file drivers/video/bootsplash/bootsplash.h,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/bootsplash.h.rej
The next patch would create the file drivers/video/bootsplash/decode-jpg.c,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/decode-jpg.c.rej
The next patch would create the file drivers/video/bootsplash/decode-jpg.h,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/decode-jpg.h.rej
The next patch would create the file drivers/video/bootsplash/render.c,
which already exists! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/bootsplash/render.c.rej
patching file drivers/video/console/fbcon.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
19 out of 19 hunks ignored -- saving rejects to file drivers/video/console/fbcon.c.rej
patching file drivers/video/console/fbcon.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/console/fbcon.h.rej
patching file drivers/video/vesafb.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file drivers/video/vesafb.c.rej
patching file include/linux/console_struct.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/console_struct.h.rej
patching file include/linux/fb.h
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file include/linux/fb.h.rej
patching file kernel/panic.c
Reversed (or previously applied) patch detected! Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file kernel/panic.c.rej
patching file drivers/video/bootsplash/bootsplash.c
Hunk #1 succeeded at 557 (offset 1 line).
Hunk #2 succeeded at 566 (offset 1 line).
Hunk #3 succeeded at 727 (offset 1 line).
Hunk #4 succeeded at 756 (offset 1 line).
Hunk #5 succeeded at 792 (offset 1 line).
Hunk #6 succeeded at 802 (offset 1 line).
Hunk #7 succeeded at 824 (offset 1 line).
Hunk #8 succeeded at 879 (offset -2 lines).
patching file arch/arm/kernel/ecard.c
patching file arch/i386/kernel/apm.c
patching file arch/i386/kernel/cpu/mcheck/non-fatal.c
patching file arch/i386/kernel/io_apic.c
Hunk #1 succeeded at 34 (offset 3 lines).
Hunk #2 succeeded at 604 (offset 3 lines).
patching file arch/i386/kernel/process.c
patching file arch/i386/kernel/signal.c
patching file arch/i386/kernel/smp.c
Hunk #1 succeeded at 476 (offset 23 lines).
patching file arch/i386/mm/init.c
patching file arch/i386/mm/pageattr.c
patching file arch/i386/power/cpu.c
patching file arch/i386/power/Makefile
patching file arch/i386/power/suspend2.c
patching file arch/ppc/Kconfig
patching file arch/ppc/kernel/signal.c
patching file arch/ppc/kernel/vmlinux.lds.S
patching file arch/ppc/Makefile
patching file arch/ppc/mm/init.c
patching file arch/ppc/platforms/pmac_feature.c
patching file arch/ppc/power/cpu.c
patching file arch/ppc/power/cpu_reg.S
patching file arch/ppc/power/Makefile
patching file arch/ppc/power/swsusp2-asm.S
patching file arch/ppc/power/swsusp2.c
patching file arch/ppc/power/swsusp2-copyback.S
patching file Documentation/kernel-parameters.txt
patching file Documentation/power/swsusp2.txt
patching file drivers/acpi/osl.c
patching file drivers/acpi/sleep/proc.c
patching file drivers/base/power/resume.c
patching file drivers/block/ll_rw_blk.c
patching file drivers/block/loop.c
patching file drivers/char/hvc_console.c
patching file drivers/char/keyboard.c
Hunk #2 FAILED at 42.
Hunk #3 succeeded at 1104 (offset 28 lines).
1 out of 3 hunks FAILED -- saving rejects to file drivers/char/keyboard.c.rej
patching file drivers/char/n_tty.c
Hunk #2 succeeded at 1212 (offset 22 lines).
Hunk #3 succeeded at 1267 (offset 22 lines).
patching file drivers/char/tty_io.c
patching file drivers/char/vt.c
Hunk #1 succeeded at 154 (offset 4 lines).
Hunk #2 succeeded at 556 (offset 4 lines).
Hunk #3 succeeded at 890 (offset 1 line).
Hunk #4 succeeded at 917 (offset 1 line).
Hunk #5 succeeded at 1434 (offset 3 lines).
Hunk #6 succeeded at 1929 (offset 4 lines).
Hunk #7 succeeded at 2071 (offset 5 lines).
patching file drivers/ide/ide.c
patching file drivers/ieee1394/nodemgr.c
patching file drivers/input/serio/serio.c
patching file drivers/macintosh/Kconfig
patching file drivers/macintosh/via-pmu.c
patching file drivers/md/dm-crypt.c
patching file drivers/md/md.c
patching file drivers/media/video/msp3400.c
patching file drivers/media/video/tvaudio.c
patching file drivers/message/i2o/i2o_block.c
patching file drivers/message/i2o/i2o_core.c
patching file drivers/mtd/mtdblock.c
patching file drivers/net/irda/sir_kthread.c
patching file drivers/net/wan/sdlamain.c
patching file drivers/parport/ieee1284.c
patching file drivers/pcmcia/cs.c
patching file drivers/pnp/pnpbios/core.c
patching file drivers/s390/cio/device.c
patching file drivers/scsi/scsi_error.c
patching file drivers/serial/8250.c
Hunk #1 succeeded at 63 (offset 13 lines).
Hunk #2 succeeded at 840 (offset 13 lines).
Hunk #3 succeeded at 1003 (offset 25 lines).
patching file drivers/usb/core/hub.c
patching file drivers/usb/storage/usb.c
patching file drivers/video/console/fbcon.c
Hunk #1 succeeded at 1270 (offset 74 lines).
patching file fs/aio.c
patching file fs/buffer.c
patching file fs/dcache.c
patching file fs/devfs/base.c
patching file fs/exec.c
patching file fs/fcntl.c
patching file fs/jbd/journal.c
patching file fs/jffs/intrep.c
patching file fs/jffs2/background.c
patching file fs/jfs/jfs_logmgr.c
patching file fs/jfs/jfs_txnmgr.c
patching file fs/lockd/clntlock.c
patching file fs/lockd/clntproc.c
patching file fs/lockd/svc.c
patching file fs/locks.c
patching file fs/namei.c
patching file fs/namespace.c
Hunk #4 succeeded at 974 (offset 9 lines).
Hunk #5 succeeded at 1009 (offset 9 lines).
Hunk #6 succeeded at 1102 (offset 9 lines).
Hunk #7 succeeded at 1184 (offset 9 lines).
patching file fs/nfsd/nfssvc.c
patching file fs/open.c
patching file fs/pipe.c
patching file fs/proc/generic.c
patching file fs/proc/kmsg.c
patching file fs/read_write.c
patching file fs/reiserfs/journal.c
patching file fs/select.c
patching file fs/stat.c
patching file fs/super.c
Hunk #2 succeeded at 453 (offset 3 lines).
Hunk #3 succeeded at 471 (offset 3 lines).
patching file fs/sysfs/file.c
patching file fs/xfs/linux-2.6/xfs_buf.c
patching file fs/xfs/linux-2.6/xfs_super.c
patching file include/asm-i386/cpufeature.h
patching file include/asm-i386/mtrr.h
patching file include/asm-i386/suspend.h
patching file include/asm-i386/tlbflush.h
patching file include/asm-ppc/suspend.h
patching file include/linux/kthread.h
patching file include/linux/sched.h
patching file include/linux/suspend1.h
patching file include/linux/suspend.h
patching file include/linux/suspend-version-specific.h
patching file include/linux/workqueue.h
patching file init/do_mounts.c
patching file kernel/exit.c
Hunk #1 succeeded at 32 (offset 3 lines).
Hunk #2 succeeded at 773 (offset 3 lines).
Hunk #3 succeeded at 783 (offset 3 lines).
Hunk #4 succeeded at 1108 (offset 10 lines).
Hunk #5 succeeded at 1177 (offset 10 lines).
patching file kernel/fork.c
patching file kernel/kmod.c
patching file kernel/kthread.c
patching file kernel/module.c
patching file kernel/panic.c
patching file kernel/power/console.c
patching file kernel/power/disk.c
patching file kernel/power/Kconfig
patching file kernel/power/main.c
patching file kernel/power/Makefile
patching file kernel/power/pmdisk.c
patching file kernel/power/process.c
patching file kernel/power/swsusp.c
patching file kernel/sched.c
patching file kernel/softirq.c
patching file kernel/stop_machine.c
patching file kernel/sys.c
patching file kernel/workqueue.c
patching file mm/bootmem.c
patching file mm/filemap.c
patching file mm/highmem.c
patching file mm/oom_kill.c
patching file mm/page_alloc.c
patching file mm/page-writeback.c
patching file mm/pdflush.c
patching file mm/swapfile.c
Hunk #1 succeeded at 33 (offset 4 lines).
Hunk #2 succeeded at 197 (offset 4 lines).
Hunk #3 succeeded at 276 (offset 4 lines).
patching file mm/vmscan.c
patching file net/bluetooth/bnep/core.c
patching file net/bluetooth/rfcomm/core.c
patching file net/socket.c
patching file net/sunrpc/sched.c
patching file net/sunrpc/svcsock.c
patching file include/linux/suspend-common.h
patching file include/linux/suspend-debug.h
patching file include/linux/suspend.h
patching file kernel/power/Changelog
patching file kernel/power/gzipcompress.c
patching file kernel/power/Internals
patching file kernel/power/io.c
patching file kernel/power/lzf/lzf_c.c
patching file kernel/power/lzf/lzf_d.c
patching file kernel/power/lzfcompress.c
patching file kernel/power/memory_pool.c
patching file kernel/power/nulltransformer.c
patching file kernel/power/nullwriter.c
patching file kernel/power/pagedir.c
patching file kernel/power/prepare_image.c
patching file kernel/power/proc.c
patching file kernel/power/process.c
patching file kernel/power/range.c
patching file kernel/power/swapwriter.c
patching file kernel/power/swsusp2.c
patching file kernel/power/Todo
patching file kernel/power/ui.c
patching file Documentation/power/internals.txt
patching file Documentation/power/todo.txt
patching file include/linux/suspend-common.h
patching file include/linux/suspend-debug.h
patching file include/linux/suspend.h
patching file include/linux/suspend-utility.h
patching file kernel/power/gzipcompress.c
patching file kernel/power/Internals
patching file kernel/power/io.c
patching file kernel/power/lzf/lzf_c.c
patching file kernel/power/lzf/lzf_d.c
patching file kernel/power/lzfcompress.c
patching file kernel/power/memory_pool.c
patching file kernel/power/nfswriter.c
patching file kernel/power/nulltransformer.c
patching file kernel/power/nullwriter.c
patching file kernel/power/pagedir.c
patching file kernel/power/prepare_image.c
patching file kernel/power/proc.c
patching file kernel/power/process.c
patching file kernel/power/range.c
patching file kernel/power/suspend2.c
patching file kernel/power/swapwriter.c
patching file kernel/power/swsusp2.c
patching file kernel/power/Todo
patching file kernel/power/ui.c
patching file kernel/power/utility.c
|
and when i try to compile the kernel whit swsusp2 support
Code: | CC arch/x86_64/kernel/suspend.o
arch/x86_64/kernel/suspend.c: In Funktion >>save_processor_state<<:
arch/x86_64/kernel/suspend.c:40: Warnung: implicit declaration of function `kernel_fpu_begin'
arch/x86_64/kernel/suspend.c:45: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:46: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:47: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:48: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:55: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:56: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:57: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:58: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:59: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:61: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:62: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:63: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:68: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:69: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:70: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:71: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c: In Funktion >>do_fpu_end<<:
arch/x86_64/kernel/suspend.c:79: Warnung: implicit declaration of function `kernel_fpu_end'
arch/x86_64/kernel/suspend.c:80: Warnung: implicit declaration of function `mxcsr_feature_mask_init'
arch/x86_64/kernel/suspend.c: In Funktion >>restore_processor_state<<:
arch/x86_64/kernel/suspend.c:88: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:89: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:90: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:91: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:96: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:97: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:98: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:99: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:100: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:102: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:102: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:103: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:103: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:104: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:104: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:110: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:111: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:112: error: invalid use of undefined type `struct saved_context'
arch/x86_64/kernel/suspend.c:114: Warnung: implicit declaration of function `fix_processor_context'
arch/x86_64/kernel/suspend.c: Auf h?chster Ebene:
arch/x86_64/kernel/suspend.c:120: Warnung: type mismatch with previous implicit declaration
arch/x86_64/kernel/suspend.c:114: Warnung: previous implicit declaration of `fix_processor_context'
arch/x86_64/kernel/suspend.c:120: Warnung: >>fix_processor_context<< wurde bereits implizit deklariert, >>int<< zur?ckzugeben
arch/x86_64/kernel/suspend.c: In Funktion >>fix_processor_context<<:
arch/x86_64/kernel/suspend.c:124: Warnung: implicit declaration of function `set_tss_desc'
arch/x86_64/kernel/suspend.c:126: error: `cpu_gdt_table' undeclared (first use in this function)
arch/x86_64/kernel/suspend.c:126: error: (Each undeclared identifier is reported only once
arch/x86_64/kernel/suspend.c:126: error: for each function it appears in.)
arch/x86_64/kernel/suspend.c:129: Warnung: implicit declaration of function `load_TR_desc'
arch/x86_64/kernel/suspend.c:130: Warnung: implicit declaration of function `load_LDT'
arch/x86_64/kernel/suspend.c:136: Warnung: implicit declaration of function `loaddebug'
arch/x86_64/kernel/suspend.c: Auf h?chster Ebene:
arch/x86_64/kernel/suspend.c:30: error: storage size of `saved_context' isn't known
make[1]: *** [arch/x86_64/kernel/suspend.o] Fehler 1
make: *** [arch/x86_64/kernel] Fehler 2 |
any suggestions about this? thanks for your help |
|
Back to top |
|
|
|