diff options
| author | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-14 09:43:58 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmartin@redhat.com> | 2011-06-14 09:54:44 -0400 |
| commit | 61c49032724ea62735fcf7ad8207c1321a783f6a (patch) | |
| tree | 08e10f2347883937c1a6164867e71455688bad7c /linux-2.6-i386-nx-emulation.patch | |
| parent | 33b31a1c76d9c7289003cb312be40d4e0a358c38 (diff) | |
| download | kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.tar.gz kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.tar.xz kernel-61c49032724ea62735fcf7ad8207c1321a783f6a.zip | |
Update to 3.0-rc3
Add another conflicts to deal with 2 digit
versions (libdm.)
Now that $SUBLEVEL in Makefile is optional, drop it and simplify
linux-3.0-fix-uts-release.patch
linux-2.6-i386-nx-emulation.patch: fix simple reject
drm-intel-eeebox-eb1007-quirk.patch,
revert-ftrace-remove-unnecessary-disabling-of-irqs.patch,
ath5k-disable-fast-channel-switching-by-default.patch: drop
upstream patches.
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
| -rw-r--r-- | linux-2.6-i386-nx-emulation.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch index a6ac19f6d..856b9b95a 100644 --- a/linux-2.6-i386-nx-emulation.patch +++ b/linux-2.6-i386-nx-emulation.patch @@ -143,8 +143,8 @@ set_user_gs(regs, 0); + regs->fs = 0; - set_fs(USER_DS); regs->ds = __USER_DS; + regs->es = __USER_DS; @@ -252,6 +255,11 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) regs->cs = __USER_CS; regs->ip = new_ip; |