From 9232015ddbd8656e501019587f18e417789d7b65 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 24 Oct 2006 15:18:36 -0700 Subject: [PATCH] --- yaml --- r: 40259 b: refs/heads/master c: 82571026b9771c4035b0c62abbbe588fe73373ea h: refs/heads/master i: 40257: 2f91ded3b213430106d945b1a209c0f32881364a 40255: 970dea93af0385cbecc5f3a2a5668b98710343b1 v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/mconsole_kern.c | 23 +++++-------------- trunk/arch/um/drivers/mconsole_user.c | 1 - trunk/arch/um/include/mconsole.h | 1 - trunk/drivers/misc/Kconfig | 1 - trunk/drivers/misc/ioc4.c | 1 - trunk/drivers/mmc/tifm_sd.c | 1 - .../net/wireless/bcm43xx/bcm43xx_dma.h | 1 - trunk/net/ipv4/ipconfig.c | 2 +- trunk/sound/pci/intel8x0.c | 6 ----- 10 files changed, 8 insertions(+), 31 deletions(-) diff --git a/[refs] b/[refs] index fbea50ac3aa9..49b5cd8da6a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2099c99e3b24f86b131566aa9854249189ae9ea2 +refs/heads/master: 82571026b9771c4035b0c62abbbe588fe73373ea diff --git a/trunk/arch/um/drivers/mconsole_kern.c b/trunk/arch/um/drivers/mconsole_kern.c index 7b172160fe04..d08bd036ccb8 100644 --- a/trunk/arch/um/drivers/mconsole_kern.c +++ b/trunk/arch/um/drivers/mconsole_kern.c @@ -79,7 +79,7 @@ static irqreturn_t mconsole_interrupt(int irq, void *dev_id) /* long to avoid size mismatch warnings from gcc */ long fd; struct mconsole_entry *new; - static struct mc_request req; /* that's OK */ + struct mc_request req; fd = (long) dev_id; while (mconsole_get_request(fd, &req)){ @@ -91,7 +91,6 @@ static irqreturn_t mconsole_interrupt(int irq, void *dev_id) mconsole_reply(&req, "Out of memory", 1, 0); else { new->request = req; - new->request.regs = get_irq_regs()->regs; list_add(&new->list, &mc_requests); } } @@ -315,21 +314,9 @@ void mconsole_stop(struct mc_request *req) { deactivate_fd(req->originating_fd, MCONSOLE_IRQ); os_set_fd_block(req->originating_fd, 1); - mconsole_reply(req, "stopped", 0, 0); - while (mconsole_get_request(req->originating_fd, req)) { - if (req->cmd->handler == mconsole_go) - break; - if (req->cmd->handler == mconsole_stop) { - mconsole_reply(req, "Already stopped", 1, 0); - continue; - } - if (req->cmd->handler == mconsole_sysrq) { - struct pt_regs *old_regs; - old_regs = set_irq_regs((struct pt_regs *)&req->regs); - mconsole_sysrq(req); - set_irq_regs(old_regs); - continue; - } + mconsole_reply(req, "", 0, 0); + while(mconsole_get_request(req->originating_fd, req)){ + if(req->cmd->handler == mconsole_go) break; (*req->cmd->handler)(req); } os_set_fd_block(req->originating_fd, 0); @@ -686,7 +673,9 @@ static void with_console(struct mc_request *req, void (*proc)(void *), static void sysrq_proc(void *arg) { char *op = arg; + struct pt_regs *old_regs = set_irq_regs(¤t->thread.regs); handle_sysrq(*op, NULL); + set_irq_regs(old_regs); } void mconsole_sysrq(struct mc_request *req) diff --git a/trunk/arch/um/drivers/mconsole_user.c b/trunk/arch/um/drivers/mconsole_user.c index 75aef6f7ef6e..17068eb746c0 100644 --- a/trunk/arch/um/drivers/mconsole_user.c +++ b/trunk/arch/um/drivers/mconsole_user.c @@ -14,7 +14,6 @@ #include #include #include "user.h" -#include "sysdep/ptrace.h" #include "mconsole.h" #include "umid.h" #include "user_util.h" diff --git a/trunk/arch/um/include/mconsole.h b/trunk/arch/um/include/mconsole.h index 2666815b6af5..58f67d391105 100644 --- a/trunk/arch/um/include/mconsole.h +++ b/trunk/arch/um/include/mconsole.h @@ -61,7 +61,6 @@ struct mc_request struct mconsole_request request; struct mconsole_command *cmd; - union uml_pt_regs regs; }; extern char mconsole_socket_name[]; diff --git a/trunk/drivers/misc/Kconfig b/trunk/drivers/misc/Kconfig index 00db31c314e0..b6c045dc97b4 100644 --- a/trunk/drivers/misc/Kconfig +++ b/trunk/drivers/misc/Kconfig @@ -30,7 +30,6 @@ config IBM_ASM config SGI_IOC4 tristate "SGI IOC4 Base IO support" - depends on PCI ---help--- This option enables basic support for the IOC4 chip on certain SGI IO controller cards (IO9, IO10, and PCI-RT). This option diff --git a/trunk/drivers/misc/ioc4.c b/trunk/drivers/misc/ioc4.c index 79354bbbbd6a..1c3c14a3839c 100644 --- a/trunk/drivers/misc/ioc4.c +++ b/trunk/drivers/misc/ioc4.c @@ -32,7 +32,6 @@ #include #include #include -#include /*************** * Definitions * diff --git a/trunk/drivers/mmc/tifm_sd.c b/trunk/drivers/mmc/tifm_sd.c index 0fdc55b08a6d..2bacff60913d 100644 --- a/trunk/drivers/mmc/tifm_sd.c +++ b/trunk/drivers/mmc/tifm_sd.c @@ -14,7 +14,6 @@ #include #include #include -#include #define DRIVER_NAME "tifm_sd" #define DRIVER_VERSION "0.6" diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.h index d1105e569a41..ea16078cfe98 100644 --- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.h +++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c index f8ce84759159..955a07abb91d 100644 --- a/trunk/net/ipv4/ipconfig.c +++ b/trunk/net/ipv4/ipconfig.c @@ -420,7 +420,7 @@ ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt { struct arphdr *rarp; unsigned char *rarp_ptr; - unsigned long sip, tip; + u32 sip, tip; unsigned char *sha, *tha; /* s for "source", t for "target" */ struct ic_device *d; diff --git a/trunk/sound/pci/intel8x0.c b/trunk/sound/pci/intel8x0.c index 9c1bce7afa86..7f22dab07240 100644 --- a/trunk/sound/pci/intel8x0.c +++ b/trunk/sound/pci/intel8x0.c @@ -1961,12 +1961,6 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { .name = "Tyan Thunder K8WE", .type = AC97_TUNE_HP_ONLY }, - { - .subvendor = 0x10f7, - .subdevice = 0x834c, - .name = "Panasonic CF-R4", - .type = AC97_TUNE_HP_ONLY, - }, { .subvendor = 0x110a, .subdevice = 0x0056,