---

yaml
---
r: 40259
b: refs/heads/master
c: 8257102
h: refs/heads/master
i:
  40257: 2f91ded
  40255: 970dea9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2099c99e3b24f86b131566aa9854249189ae9ea2
+refs/heads/master: 82571026b9771c4035b0c62abbbe588fe73373ea

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(&current->thread.regs);
 	handle_sysrq(*op, NULL);
+	set_irq_regs(old_regs);
 }
 
 void mconsole_sysrq(struct mc_request *req)

trunk/arch/um/drivers/mconsole_user.c

@@ -14,7 +14,6 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include "user.h"
-#include "sysdep/ptrace.h"
 #include "mconsole.h"
 #include "umid.h"
 #include "user_util.h"

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[];

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

trunk/drivers/misc/ioc4.c

@@ -32,7 +32,6 @@
 #include <linux/ktime.h>
 #include <linux/mutex.h>
 #include <linux/time.h>
-#include <asm/io.h>
 
 /***************
  * Definitions *

trunk/drivers/mmc/tifm_sd.c

@@ -14,7 +14,6 @@
 #include <linux/mmc/protocol.h>
 #include <linux/mmc/host.h>
 #include <linux/highmem.h>
-#include <asm/io.h>
 
 #define DRIVER_NAME "tifm_sd"
 #define DRIVER_VERSION "0.6"

trunk/drivers/net/wireless/bcm43xx/bcm43xx_dma.h

@@ -4,7 +4,6 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
-#include <linux/dma-mapping.h>
 #include <linux/linkage.h>
 #include <asm/atomic.h>
 

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;
 

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,