Fixes http://bugme.osdl.org/show_bug.cgi?id=4824
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/acpi/pci_irq.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.12.y/drivers/acpi/pci_irq.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/acpi/pci_irq.c
-+++ linux-2.6.12.y/drivers/acpi/pci_irq.c
-@@ -433,7 +433,7 @@ acpi_pci_irq_enable (
+--- linux-2.6.12.2.orig/drivers/acpi/pci_irq.c 2005-07-13 10:53:01.000000000 -0700
++++ linux-2.6.12.2/drivers/acpi/pci_irq.c 2005-07-13 10:56:30.000000000 -0700
+@@ -433,7 +433,7 @@
printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI",
pci_name(dev), ('A' + pin));
/* Interrupt Line values above 0xF are forbidden */
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ net/ipv4/ip_output.c | 3 ---
+ net/ipv4/netfilter/ip_conntrack_standalone.c | 7 +++++++
+ net/packet/af_packet.c | 6 ++++++
+ 3 files changed, 13 insertions(+), 3 deletions(-)
---- linux-2.6.12/net/ipv4/ip_output.c_orig 2005-07-12 13:42:56.000000000 +0100
-+++ linux-2.6.12/net/ipv4/ip_output.c 2005-07-12 13:46:03.000000000 +0100
-@@ -111,7 +111,6 @@ static int ip_dev_loopback_xmit(struct s
+--- linux-2.6.12.2.orig/net/ipv4/ip_output.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/net/ipv4/ip_output.c 2005-07-13 10:56:44.000000000 -0700
+@@ -111,7 +111,6 @@
#ifdef CONFIG_NETFILTER_DEBUG
nf_debug_ip_loopback_xmit(newskb);
#endif
netif_rx(newskb);
return 0;
}
-@@ -196,8 +195,6 @@ static inline int ip_finish_output2(stru
+@@ -196,8 +195,6 @@
nf_debug_ip_finish_output2(skb);
#endif /*CONFIG_NETFILTER_DEBUG*/
if (hh) {
int hh_alen;
---- linux-2.6.12/net/ipv4/netfilter/ip_conntrack_standalone.c_orig 2005-07-12 13:43:16.000000000 +0100
-+++ linux-2.6.12/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-07-12 13:47:44.000000000 +0100
-@@ -432,6 +432,13 @@ static unsigned int ip_conntrack_defrag(
+--- linux-2.6.12.2.orig/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-07-13 10:56:44.000000000 -0700
+@@ -432,6 +432,13 @@
const struct net_device *out,
int (*okfn)(struct sk_buff *))
{
/* Gather fragments. */
if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
*pskb = ip_ct_gather_frags(*pskb,
---- linux-2.6.12/net/packet/af_packet.c_orig 2005-07-12 13:47:38.000000000 +0100
-+++ linux-2.6.12/net/packet/af_packet.c 2005-07-12 13:47:44.000000000 +0100
-@@ -274,6 +274,9 @@ static int packet_rcv_spkt(struct sk_buf
+--- linux-2.6.12.2.orig/net/packet/af_packet.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/net/packet/af_packet.c 2005-07-13 10:56:44.000000000 -0700
+@@ -274,6 +274,9 @@
dst_release(skb->dst);
skb->dst = NULL;
spkt = (struct sockaddr_pkt*)skb->cb;
skb_push(skb, skb->data-skb->mac.raw);
-@@ -517,6 +520,9 @@ static int packet_rcv(struct sk_buff *sk
+@@ -517,6 +520,9 @@
dst_release(skb->dst);
skb->dst = NULL;
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
arch/ppc/kernel/time.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
-Index: linux-2.6.12.y/arch/ppc/kernel/time.c
-===================================================================
---- linux-2.6.12.y.orig/arch/ppc/kernel/time.c
-+++ linux-2.6.12.y/arch/ppc/kernel/time.c
-@@ -89,6 +89,9 @@ unsigned long tb_to_ns_scale;
+--- linux-2.6.12.2.orig/arch/ppc/kernel/time.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/ppc/kernel/time.c 2005-07-13 10:56:23.000000000 -0700
+@@ -89,6 +89,9 @@
extern unsigned long wall_jiffies;
DEFINE_SPINLOCK(rtc_lock);
EXPORT_SYMBOL(rtc_lock);
-@@ -170,7 +173,7 @@ void timer_interrupt(struct pt_regs * re
+@@ -170,7 +173,7 @@
xtime.tv_sec - last_rtc_update >= 659 &&
abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
jiffies - wall_jiffies == 1) {
last_rtc_update = xtime.tv_sec+1;
else
/* Try again one minute later */
-@@ -286,7 +289,7 @@ void __init time_init(void)
+@@ -286,7 +289,7 @@
unsigned old_stamp, stamp, elapsed;
if (ppc_md.time_init != NULL)
if (__USE_RTC()) {
/* 601 processor: dec counts down by 128 every 128ns */
-@@ -331,10 +334,10 @@ void __init time_init(void)
+@@ -331,10 +334,10 @@
set_dec(tb_ticks_per_jiffy);
/* If platform provided a timezone (pmac), we correct the time */
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ drivers/net/shaper.c | 42 ++++++++++++++++--------------------------
+ include/linux/if_shaper.h | 2 +-
+ 2 files changed, 17 insertions(+), 27 deletions(-)
-diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
---- a/drivers/net/shaper.c
-+++ b/drivers/net/shaper.c
-@@ -135,10 +135,8 @@ static int shaper_start_xmit(struct sk_b
+--- linux-2.6.12.2.orig/drivers/net/shaper.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/net/shaper.c 2005-07-13 10:56:34.000000000 -0700
+@@ -135,10 +135,8 @@
{
struct shaper *shaper = dev->priv;
struct sk_buff *ptr;
- if (down_trylock(&shaper->sem))
- return -1;
-
-+
++
+ spin_lock(&shaper->lock);
ptr=shaper->sendq.prev;
/*
-@@ -232,7 +230,7 @@ static int shaper_start_xmit(struct sk_b
+@@ -232,7 +230,7 @@
shaper->stats.collisions++;
}
shaper_kick(shaper);
return 0;
}
-@@ -271,11 +269,9 @@ static void shaper_timer(unsigned long d
+@@ -271,11 +269,9 @@
{
struct shaper *shaper = (struct shaper *)data;
}
/*
-@@ -332,21 +328,6 @@ static void shaper_kick(struct shaper *s
+@@ -332,21 +328,6 @@
/*
* Bring the interface up. We just disallow this until a
* bind.
*/
-@@ -375,7 +356,15 @@ static int shaper_open(struct net_device
+@@ -375,7 +356,15 @@
static int shaper_close(struct net_device *dev)
{
struct shaper *shaper=dev->priv;
del_timer_sync(&shaper->timer);
return 0;
}
-@@ -576,6 +565,7 @@ static void shaper_init_priv(struct net_
+@@ -576,6 +565,7 @@
init_timer(&sh->timer);
sh->timer.function=shaper_timer;
sh->timer.data=(unsigned long)sh;
}
/*
-diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
---- a/include/linux/if_shaper.h
-+++ b/include/linux/if_shaper.h
-@@ -23,7 +23,7 @@ struct shaper
+--- linux-2.6.12.2.orig/include/linux/if_shaper.h 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/include/linux/if_shaper.h 2005-07-13 10:56:34.000000000 -0700
+@@ -23,7 +23,7 @@
__u32 shapeclock;
unsigned long recovery; /* Time we can next clock a packet out on
an empty queue */
struct net_device_stats stats;
struct net_device *dev;
int (*hard_start_xmit) (struct sk_buff *skb,
-
Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/net/hamradio/Kconfig | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.12.y/drivers/net/hamradio/Kconfig
-===================================================================
---- linux-2.6.12.y.orig/drivers/net/hamradio/Kconfig
-+++ linux-2.6.12.y/drivers/net/hamradio/Kconfig
-@@ -17,7 +17,7 @@ config MKISS
+--- linux-2.6.12.2.orig/drivers/net/hamradio/Kconfig 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/net/hamradio/Kconfig 2005-07-13 10:56:32.000000000 -0700
+@@ -17,7 +17,7 @@
config 6PACK
tristate "Serial port 6PACK driver"
Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/char/tpm/tpm.c | 76 -------------------------------------------
drivers/char/tpm/tpm.h | 2 -
drivers/char/tpm/tpm_atmel.c | 16 +++++----
drivers/char/tpm/tpm_nsc.c | 16 +++++----
4 files changed, 20 insertions(+), 90 deletions(-)
-Index: linux-2.6.12.y/drivers/char/tpm/tpm_atmel.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/char/tpm/tpm_atmel.c
-+++ linux-2.6.12.y/drivers/char/tpm/tpm_atmel.c
+--- linux-2.6.12.2.orig/drivers/char/tpm/tpm_atmel.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/char/tpm/tpm_atmel.c 2005-07-13 10:56:27.000000000 -0700
@@ -22,7 +22,10 @@
#include "tpm.h"
/* write status bits */
#define ATML_STATUS_ABORT 0x01
-@@ -127,7 +130,6 @@ static struct tpm_vendor_specific tpm_at
+@@ -127,7 +130,6 @@
.cancel = tpm_atml_cancel,
.req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
.req_complete_val = ATML_STATUS_DATA_AVAIL,
.miscdev = { .fops = &atmel_ops, },
};
-@@ -136,14 +138,16 @@ static int __devinit tpm_atml_init(struc
+@@ -136,14 +138,16 @@
{
u8 version[4];
int rc = 0;
/* verify that it is an Atmel part */
if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'
-Index: linux-2.6.12.y/drivers/char/tpm/tpm.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/char/tpm/tpm.c
-+++ linux-2.6.12.y/drivers/char/tpm/tpm.c
+--- linux-2.6.12.2.orig/drivers/char/tpm/tpm.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/char/tpm/tpm.c 2005-07-13 10:56:27.000000000 -0700
@@ -32,12 +32,6 @@
#define TPM_BUFSIZE 2048
static LIST_HEAD(tpm_chip_list);
static DEFINE_SPINLOCK(driver_lock);
static int dev_mask[32];
-@@ -61,72 +55,6 @@ void tpm_time_expired(unsigned long ptr)
+@@ -61,72 +55,6 @@
EXPORT_SYMBOL_GPL(tpm_time_expired);
/*
* Internal kernel interface to transmit TPM commands
*/
static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
-@@ -590,10 +518,6 @@ int tpm_pm_resume(struct pci_dev *pci_de
+@@ -590,10 +518,6 @@
if (chip == NULL)
return -ENODEV;
return 0;
}
-Index: linux-2.6.12.y/drivers/char/tpm/tpm.h
-===================================================================
---- linux-2.6.12.y.orig/drivers/char/tpm/tpm.h
-+++ linux-2.6.12.y/drivers/char/tpm/tpm.h
-@@ -79,8 +79,6 @@ static inline void tpm_write_index(int i
+--- linux-2.6.12.2.orig/drivers/char/tpm/tpm.h 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/char/tpm/tpm.h 2005-07-13 10:56:27.000000000 -0700
+@@ -79,8 +79,6 @@
}
extern void tpm_time_expired(unsigned long);
extern int tpm_register_hardware(struct pci_dev *,
struct tpm_vendor_specific *);
extern int tpm_open(struct inode *, struct file *);
-Index: linux-2.6.12.y/drivers/char/tpm/tpm_nsc.c
-===================================================================
---- linux-2.6.12.y.orig/drivers/char/tpm/tpm_nsc.c
-+++ linux-2.6.12.y/drivers/char/tpm/tpm_nsc.c
+--- linux-2.6.12.2.orig/drivers/char/tpm/tpm_nsc.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/char/tpm/tpm_nsc.c 2005-07-13 10:56:27.000000000 -0700
@@ -24,6 +24,10 @@
/* National definitions */
#define TPM_NSC_BASE 0x360
#define NSC_LDN_INDEX 0x07
#define NSC_SID_INDEX 0x20
-@@ -234,7 +238,6 @@ static struct tpm_vendor_specific tpm_ns
+@@ -234,7 +238,6 @@
.cancel = tpm_nsc_cancel,
.req_complete_mask = NSC_STATUS_OBF,
.req_complete_val = NSC_STATUS_OBF,
.miscdev = { .fops = &nsc_ops, },
};
-@@ -243,15 +246,16 @@ static int __devinit tpm_nsc_init(struct
+@@ -243,15 +246,16 @@
const struct pci_device_id *pci_id)
{
int rc = 0;
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
- cx88-video.c | 2 +-
+ drivers/media/video/cx88/cx88-video.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
-diff -upr linux-2.6.12.2/drivers/media/video/cx88/cx88-video.c linux/drivers/media/video/cx88/cx88-video.c
---- linux-2.6.12.2/drivers/media/video/cx88/cx88-video.c 2005-06-17 15:48:29.000000000 -0400
-+++ linux/drivers/media/video/cx88/cx88-video.c 2005-06-30 11:47:49.000000000 -0400
-@@ -261,7 +261,7 @@ static struct cx88_ctrl cx8800_ctls[] =
+--- linux-2.6.12.2.orig/drivers/media/video/cx88/cx88-video.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/media/video/cx88/cx88-video.c 2005-07-13 10:56:14.000000000 -0700
+@@ -261,7 +261,7 @@
.default_value = 0,
.type = V4L2_CTRL_TYPE_INTEGER,
},
.reg = MO_HUE,
.mask = 0x00ff,
.shift = 0,
-
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
drivers/char/tty_ioctl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-diff -puN drivers/char/tty_ioctl.c~coverity-tty_ldisc_ref-return-null-check drivers/char/tty_ioctl.c
---- stable/drivers/char/tty_ioctl.c~coverity-tty_ldisc_ref-return-null-check 2005-06-29 18:11:16.000000000 -0700
-+++ stable-akpm/drivers/char/tty_ioctl.c 2005-06-29 18:11:16.000000000 -0700
-@@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty,
+--- linux-2.6.12.2.orig/drivers/char/tty_ioctl.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/drivers/char/tty_ioctl.c 2005-07-13 10:56:39.000000000 -0700
+@@ -476,11 +476,11 @@
ld = tty_ldisc_ref(tty);
switch (arg) {
case TCIFLUSH:
ld->flush_buffer(tty);
/* fall through */
case TCOFLUSH:
-_
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
- vanilla-linux-2.6.12-paolo/arch/um/kernel/process.c | 48 ++++++++++++--------
+ arch/um/kernel/process.c | 48 ++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 deletions(-)
-diff -puN arch/um/kernel/process.c~uml-revert-fork-instead-of-clone arch/um/kernel/process.c
---- vanilla-linux-2.6.12/arch/um/kernel/process.c~uml-revert-fork-instead-of-clone 2005-07-12 18:22:03.000000000 +0200
-+++ vanilla-linux-2.6.12-paolo/arch/um/kernel/process.c 2005-07-12 18:22:03.000000000 +0200
-@@ -130,7 +130,7 @@ int start_fork_tramp(void *thread_arg, u
+--- linux-2.6.12.2.orig/arch/um/kernel/process.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/um/kernel/process.c 2005-07-13 10:56:41.000000000 -0700
+@@ -130,7 +130,7 @@
return(arg.pid);
}
{
int ret;
int pid = os_getpid(), ppid = getppid();
-@@ -159,16 +159,20 @@ static int ptrace_child(void)
+@@ -159,16 +159,20 @@
_exit(ret);
}
CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
if(n < 0)
panic("check_ptrace : wait failed, errno = %d", errno);
-@@ -176,6 +180,7 @@ static int start_ptraced_child(void)
+@@ -176,6 +180,7 @@
panic("check_ptrace : expected SIGSTOP, got status = %d",
status);
return(pid);
}
-@@ -183,12 +188,12 @@ static int start_ptraced_child(void)
+@@ -183,12 +188,12 @@
* just avoid using sysemu, not panic, but only if SYSEMU features are broken.
* So only for SYSEMU features we test mustpanic, while normal host features
* must work anyway!*/
CATCH_EINTR(n = waitpid(pid, &status, 0));
if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode)) {
int exit_with = WEXITSTATUS(status);
-@@ -199,13 +204,15 @@ static int stop_ptraced_child(int pid, i
+@@ -199,13 +204,15 @@
printk("check_ptrace : child exited with exitcode %d, while "
"expecting %d; status 0x%x", exit_with,
exitcode, status);
return ret;
}
-@@ -227,11 +234,12 @@ __uml_setup("nosysemu", nosysemu_cmd_par
+@@ -227,11 +234,12 @@
static void __init check_sysemu(void)
{
if(ptrace(PTRACE_SYSEMU, pid, 0, 0) < 0)
goto fail;
-@@ -249,7 +257,7 @@ static void __init check_sysemu(void)
+@@ -249,7 +257,7 @@
panic("check_sysemu : failed to modify system "
"call return, errno = %d", errno);
goto fail_stopped;
sysemu_supported = 1;
-@@ -257,7 +265,7 @@ static void __init check_sysemu(void)
+@@ -257,7 +265,7 @@
set_using_sysemu(!force_sysemu_disabled);
printk("Checking advanced syscall emulation patch for ptrace...");
while(1){
count++;
if(ptrace(PTRACE_SYSEMU_SINGLESTEP, pid, 0, 0) < 0)
-@@ -282,7 +290,7 @@ static void __init check_sysemu(void)
+@@ -282,7 +290,7 @@
break;
}
}
goto fail_stopped;
sysemu_supported = 2;
-@@ -293,17 +301,18 @@ static void __init check_sysemu(void)
+@@ -293,17 +301,18 @@
return;
fail:
if (ptrace(PTRACE_OLDSETOPTIONS, pid, 0, (void *)PTRACE_O_TRACESYSGOOD) < 0)
panic("check_ptrace: PTRACE_SETOPTIONS failed, errno = %d", errno);
-@@ -330,7 +339,7 @@ void __init check_ptrace(void)
+@@ -330,7 +339,7 @@
break;
}
}
printk("OK\n");
check_sysemu();
}
-@@ -362,10 +371,11 @@ void forward_pending_sigio(int target)
+@@ -362,10 +371,11 @@
static inline int check_skas3_ptrace_support(void)
{
struct ptrace_faultinfo fi;
n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
if (n < 0) {
-@@ -380,7 +390,7 @@ static inline int check_skas3_ptrace_sup
+@@ -380,7 +390,7 @@
}
init_registers(pid);
return(ret);
}
-_
Signed-off-by: Wen-chien Jesse Sung <jesse@cola.voip.idv.tw>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
+ fs/char_dev.c | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
-Index: linux-2.6.12.y/fs/char_dev.c
-===================================================================
---- linux-2.6.12.y.orig/fs/char_dev.c
-+++ linux-2.6.12.y/fs/char_dev.c
-@@ -139,7 +139,7 @@ __unregister_chrdev_region(unsigned majo
+--- linux-2.6.12.2.orig/fs/char_dev.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/fs/char_dev.c 2005-07-13 10:54:19.000000000 -0700
+@@ -139,7 +139,7 @@
struct char_device_struct *cd = NULL, **cp;
int i = major_to_index(major);
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
-
arch/x86_64/ia32/ia32_binfmt.c | 5 +----
arch/x86_64/kernel/process.c | 4 ++--
arch/x86_64/kernel/ptrace.c | 17 ++++++++++-------
include/asm-x86_64/processor.h | 11 ++++++-----
7 files changed, 25 insertions(+), 30 deletions(-)
-diff -puN arch/x86_64/ia32/ia32_binfmt.c~x86_64-task_size-fixes-for-compatibility-mode-processes arch/x86_64/ia32/ia32_binfmt.c
---- stable/arch/x86_64/ia32/ia32_binfmt.c~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/arch/x86_64/ia32/ia32_binfmt.c 2005-06-29 18:11:13.000000000 -0700
-@@ -46,7 +46,7 @@ struct elf_phdr;
+--- linux-2.6.12.2.orig/arch/x86_64/ia32/ia32_binfmt.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/x86_64/ia32/ia32_binfmt.c 2005-07-13 10:56:37.000000000 -0700
+@@ -46,7 +46,7 @@
#define IA32_EMULATOR 1
#undef ELF_ARCH
#define ELF_ARCH EM_386
-@@ -307,9 +307,6 @@ MODULE_AUTHOR("Eric Youngdale, Andi Klee
+@@ -307,9 +307,6 @@
#define elf_addr_t __u32
static void elf32_init(struct pt_regs *);
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
-diff -puN arch/x86_64/kernel/process.c~x86_64-task_size-fixes-for-compatibility-mode-processes arch/x86_64/kernel/process.c
---- stable/arch/x86_64/kernel/process.c~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/arch/x86_64/kernel/process.c 2005-06-29 18:11:13.000000000 -0700
-@@ -656,7 +656,7 @@ long do_arch_prctl(struct task_struct *t
+--- linux-2.6.12.2.orig/arch/x86_64/kernel/process.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/x86_64/kernel/process.c 2005-07-13 10:56:37.000000000 -0700
+@@ -656,7 +656,7 @@
switch (code) {
case ARCH_SET_GS:
return -EPERM;
cpu = get_cpu();
/* handle small bases via the GDT because that's faster to
-@@ -682,7 +682,7 @@ long do_arch_prctl(struct task_struct *t
+@@ -682,7 +682,7 @@
case ARCH_SET_FS:
/* Not strictly needed for fs, but do it for symmetry
with gs */
return -EPERM;
cpu = get_cpu();
/* handle small bases via the GDT because that's faster to
-diff -puN arch/x86_64/kernel/ptrace.c~x86_64-task_size-fixes-for-compatibility-mode-processes arch/x86_64/kernel/ptrace.c
---- stable/arch/x86_64/kernel/ptrace.c~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/arch/x86_64/kernel/ptrace.c 2005-06-29 18:11:13.000000000 -0700
-@@ -257,12 +257,12 @@ static int putreg(struct task_struct *ch
+--- linux-2.6.12.2.orig/arch/x86_64/kernel/ptrace.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/x86_64/kernel/ptrace.c 2005-07-13 10:56:37.000000000 -0700
+@@ -257,12 +257,12 @@
value &= 0xffff;
return 0;
case offsetof(struct user_regs_struct,fs_base):
return -EIO;
child->thread.gs = value;
return 0;
-@@ -279,7 +279,7 @@ static int putreg(struct task_struct *ch
+@@ -279,7 +279,7 @@
break;
case offsetof(struct user_regs_struct, rip):
/* Check if the new RIP address is canonical */
return -EIO;
break;
}
-@@ -419,6 +419,8 @@ asmlinkage long sys_ptrace(long request,
+@@ -419,6 +419,8 @@
break;
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO;
if ((addr & 7) ||
addr > sizeof(struct user) - 7)
-@@ -430,22 +432,22 @@ asmlinkage long sys_ptrace(long request,
+@@ -430,22 +432,22 @@
break;
/* Disallows to set a breakpoint into the vsyscall */
case offsetof(struct user, u_debugreg[0]):
child->thread.debugreg3 = data;
ret = 0;
break;
-@@ -469,6 +471,7 @@ asmlinkage long sys_ptrace(long request,
+@@ -469,6 +471,7 @@
break;
}
break;
case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
case PTRACE_CONT: /* restart after signal. */
-diff -puN arch/x86_64/kernel/sys_x86_64.c~x86_64-task_size-fixes-for-compatibility-mode-processes arch/x86_64/kernel/sys_x86_64.c
---- stable/arch/x86_64/kernel/sys_x86_64.c~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/arch/x86_64/kernel/sys_x86_64.c 2005-06-29 18:11:13.000000000 -0700
-@@ -68,13 +68,7 @@ out:
+--- linux-2.6.12.2.orig/arch/x86_64/kernel/sys_x86_64.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/x86_64/kernel/sys_x86_64.c 2005-07-13 10:56:37.000000000 -0700
+@@ -68,13 +68,7 @@
static void find_start_end(unsigned long flags, unsigned long *begin,
unsigned long *end)
{
/* This is usually used needed to map code in small
model, so it needs to be in the first 31bit. Limit
it to that. This means we need to move the
-@@ -84,10 +78,10 @@ static void find_start_end(unsigned long
+@@ -84,10 +78,10 @@
of playground for now. -AK */
*begin = 0x40000000;
*end = 0x80000000;
}
unsigned long
-diff -puN arch/x86_64/mm/fault.c~x86_64-task_size-fixes-for-compatibility-mode-processes arch/x86_64/mm/fault.c
---- stable/arch/x86_64/mm/fault.c~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/arch/x86_64/mm/fault.c 2005-06-29 18:11:13.000000000 -0700
-@@ -350,7 +350,7 @@ asmlinkage void do_page_fault(struct pt_
+--- linux-2.6.12.2.orig/arch/x86_64/mm/fault.c 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/arch/x86_64/mm/fault.c 2005-07-13 10:56:37.000000000 -0700
+@@ -350,7 +350,7 @@
* (error_code & 4) == 0, and that the fault was not a
* protection error (error_code & 1) == 0.
*/
if (!(error_code & 5) &&
((address >= VMALLOC_START && address < VMALLOC_END) ||
(address >= MODULES_VADDR && address < MODULES_END))) {
-diff -puN include/asm-x86_64/a.out.h~x86_64-task_size-fixes-for-compatibility-mode-processes include/asm-x86_64/a.out.h
---- stable/include/asm-x86_64/a.out.h~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/include/asm-x86_64/a.out.h 2005-06-29 18:11:13.000000000 -0700
-@@ -21,7 +21,7 @@ struct exec
+--- linux-2.6.12.2.orig/include/asm-x86_64/a.out.h 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/include/asm-x86_64/a.out.h 2005-07-13 10:56:37.000000000 -0700
+@@ -21,7 +21,7 @@
#ifdef __KERNEL__
#include <linux/thread_info.h>
#endif
#endif /* __A_OUT_GNU_H__ */
-diff -puN include/asm-x86_64/processor.h~x86_64-task_size-fixes-for-compatibility-mode-processes include/asm-x86_64/processor.h
---- stable/include/asm-x86_64/processor.h~x86_64-task_size-fixes-for-compatibility-mode-processes 2005-06-29 18:11:13.000000000 -0700
-+++ stable-akpm/include/asm-x86_64/processor.h 2005-06-29 18:11:13.000000000 -0700
-@@ -160,16 +160,17 @@ static inline void clear_in_cr4 (unsigne
+--- linux-2.6.12.2.orig/include/asm-x86_64/processor.h 2005-06-17 12:48:29.000000000 -0700
++++ linux-2.6.12.2/include/asm-x86_64/processor.h 2005-07-13 10:56:37.000000000 -0700
+@@ -160,16 +160,17 @@
/*
* User space process size. 47bits minus one guard page.
*/
/*
* Size of io_bitmap.
-_
projects / thirdparty / kernel / stable-queue.git / commitdiff
