---

yaml --- r: 180212 b: refs/heads/master c: b8a1d37 h: refs/heads/master v: v3
git-mirror · Feb 2, 2010 · 68ad0bd · 68ad0bd
1 parent 9e00c77
commit 68ad0bd
Show file tree

Hide file tree

Showing 45 changed files with 321 additions and 394 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a2a5660f10a468016fed594ab09d77ef0bb6079
+refs/heads/master: b8a1d37c5f981cdd2e83c9fd98198832324cd57a
diff --git a/trunk/Documentation/fault-injection/fault-injection.txt b/trunk/Documentation/fault-injection/fault-injection.txt
@@ -143,8 +143,8 @@ o provide a way to configure fault attributes
   failslab, fail_page_alloc, and fail_make_request use this way.
   Helper functions:
 
-	init_fault_attr_dentries(entries, attr, name);
-	void cleanup_fault_attr_dentries(entries);
+	init_fault_attr_entries(entries, attr, name);
+	void cleanup_fault_attr_entries(entries);
 
 - module parameters
 

diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
@@ -49,7 +49,6 @@
 #include <asm/numa.h>
 #include <asm/cacheflush.h>
 #include <asm/init.h>
-#include <linux/bootmem.h>
 
 static unsigned long dma_reserve __initdata;
 
@@ -616,21 +615,6 @@ void __init paging_init(void)
  * Memory hotplug specific functions
  */
 #ifdef CONFIG_MEMORY_HOTPLUG
-/*
- * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need
- * updating.
- */
-static void  update_end_of_memory_vars(u64 start, u64 size)
-{
-	unsigned long end_pfn = PFN_UP(start + size);
-
-	if (end_pfn > max_pfn) {
-		max_pfn = end_pfn;
-		max_low_pfn = end_pfn;
-		high_memory = (void *)__va(max_pfn * PAGE_SIZE - 1) + 1;
-	}
-}
-
 /*
  * Memory is added always to NORMAL zone. This means you will never get
  * additional DMA/DMA32 memory.
@@ -650,9 +634,6 @@ int arch_add_memory(int nid, u64 start, u64 size)
 	ret = __add_pages(nid, zone, start_pfn, nr_pages);
 	WARN_ON_ONCE(ret);
 
-	/* update max_pfn, max_low_pfn and high_memory */
-	update_end_of_memory_vars(start, size);
-
 	return ret;
 }
 EXPORT_SYMBOL_GPL(arch_add_memory);

diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c
@@ -322,7 +322,7 @@ static void pkt_sysfs_dev_remove(struct pktcdvd_device *pd)
 	pkt_kobj_remove(pd->kobj_stat);
 	pkt_kobj_remove(pd->kobj_wqueue);
 	if (class_pktcdvd)
-		device_unregister(pd->dev);
+		device_destroy(class_pktcdvd, pd->pkt_dev);
 }
 
 

diff --git a/trunk/drivers/bluetooth/Kconfig b/trunk/drivers/bluetooth/Kconfig
@@ -195,16 +195,5 @@ config BT_MRVL_SDIO
 	  Say Y here to compile support for Marvell BT-over-SDIO driver
 	  into the kernel or say M to compile it as module.
 
-config BT_ATH3K
-	tristate "Atheros firmware download driver"
-	depends on BT_HCIBTUSB
-	select FW_LOADER
-	help
-	  Bluetooth firmware download driver.
-	  This driver loads the firmware into the Atheros Bluetooth
-	  chipset.
-
-	  Say Y here to compile support for "Atheros firmware download driver"
-	  into the kernel or say M to compile it as module (ath3k).
-
 endmenu
+
diff --git a/trunk/drivers/bluetooth/Makefile b/trunk/drivers/bluetooth/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_BT_HCIBTUART)	+= btuart_cs.o
 obj-$(CONFIG_BT_HCIBTUSB)	+= btusb.o
 obj-$(CONFIG_BT_HCIBTSDIO)	+= btsdio.o
 
-obj-$(CONFIG_BT_ATH3K)		+= ath3k.o
 obj-$(CONFIG_BT_MRVL)		+= btmrvl.o
 obj-$(CONFIG_BT_MRVL_SDIO)	+= btmrvl_sdio.o
 

diff --git a/trunk/drivers/bluetooth/ath3k.c b/trunk/drivers/bluetooth/ath3k.c
diff --git a/trunk/drivers/bluetooth/bluecard_cs.c b/trunk/drivers/bluetooth/bluecard_cs.c
@@ -503,9 +503,7 @@ static irqreturn_t bluecard_interrupt(int irq, void *dev_inst)
 	unsigned int iobase;
 	unsigned char reg;
 
-	if (!info || !info->hdev)
-		/* our irq handler is shared */
-		return IRQ_NONE;
+	BUG_ON(!info->hdev);
 
 	if (!test_bit(CARD_READY, &(info->hw_state)))
 		return IRQ_HANDLED;

diff --git a/trunk/drivers/bluetooth/bt3c_cs.c b/trunk/drivers/bluetooth/bt3c_cs.c
@@ -345,9 +345,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
 	int iir;
 	irqreturn_t r = IRQ_NONE;
 
-	if (!info || !info->hdev)
-		/* our irq handler is shared */
-		return IRQ_NONE;
+	BUG_ON(!info->hdev);
 
 	iobase = info->p_dev->io.BasePort1;
 

diff --git a/trunk/drivers/bluetooth/btuart_cs.c b/trunk/drivers/bluetooth/btuart_cs.c
@@ -295,9 +295,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
 	int iir, lsr;
 	irqreturn_t r = IRQ_NONE;
 
-	if (!info || !info->hdev)
-		/* our irq handler is shared */
-		return IRQ_NONE;
+	BUG_ON(!info->hdev);
 
 	iobase = info->p_dev->io.BasePort1;
 

diff --git a/trunk/drivers/bluetooth/dtl1_cs.c b/trunk/drivers/bluetooth/dtl1_cs.c
@@ -299,9 +299,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
 	int iir, lsr;
 	irqreturn_t r = IRQ_NONE;
 
-	if (!info || !info->hdev)
-		/* our irq handler is shared */
-		return IRQ_NONE;
+	BUG_ON(!info->hdev);
 
 	iobase = info->p_dev->io.BasePort1;