---

yaml
---
r: 6029
b: refs/heads/master
c: 84a2ea1
h: refs/heads/master
i:
  6027: 29da9e5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f786648b89f00d4e66fe6b19beffd30e764651fc
+refs/heads/master: 84a2ea1c2cee0288f96e0c6aa4f975d4d26508c7

trunk/arch/arm/mach-ixp4xx/coyote-setup.c

@@ -36,7 +36,7 @@ static struct flash_platform_data coyote_flash_data = {
 
 static struct resource coyote_flash_resource = {
 	.start		= COYOTE_FLASH_BASE,
-	.end		= COYOTE_FLASH_BASE + COYOTE_FLASH_SIZE - 1,
+	.end		= COYOTE_FLASH_BASE + COYOTE_FLASH_SIZE,
 	.flags		= IORESOURCE_MEM,
 };
 

trunk/arch/arm/mach-ixp4xx/gtwx5715-setup.c

@@ -114,7 +114,7 @@ static struct flash_platform_data gtwx5715_flash_data = {
 
 static struct resource gtwx5715_flash_resource = {
 	.start		= GTWX5715_FLASH_BASE,
-	.end		= GTWX5715_FLASH_BASE + GTWX5715_FLASH_SIZE - 1,
+	.end		= GTWX5715_FLASH_BASE + GTWX5715_FLASH_SIZE,
 	.flags		= IORESOURCE_MEM,
 };
 

trunk/arch/arm/mach-ixp4xx/ixdp425-setup.c

@@ -36,7 +36,7 @@ static struct flash_platform_data ixdp425_flash_data = {
 
 static struct resource ixdp425_flash_resource = {
 	.start		= IXDP425_FLASH_BASE,
-	.end		= IXDP425_FLASH_BASE + IXDP425_FLASH_SIZE - 1,
+	.end		= IXDP425_FLASH_BASE + IXDP425_FLASH_SIZE,
 	.flags		= IORESOURCE_MEM,
 };
 

trunk/arch/ia64/pci/pci.c

@@ -380,7 +380,6 @@ void pcibios_bus_to_resource(struct pci_dev *dev,
 	res->start = region->start + offset;
 	res->end = region->end + offset;
 }
-EXPORT_SYMBOL(pcibios_bus_to_resource);
 
 static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
 {

trunk/arch/ppc/syslib/m8xx_setup.c

@@ -423,7 +423,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	ppc_md.find_end_of_memory	= m8xx_find_end_of_memory;
 	ppc_md.setup_io_mappings	= m8xx_map_io;
 
-#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 	m8xx_ide_init();
 #endif
 }

trunk/arch/ppc64/kernel/setup.c

@@ -706,8 +706,6 @@ void machine_power_off(void)
 	local_irq_disable();
 	while (1) ;
 }
-/* Used by the G5 thermal driver */
-EXPORT_SYMBOL_GPL(machine_power_off);
 
 void machine_halt(void)
 {

trunk/arch/sparc64/kernel/pci.c

@@ -540,7 +540,6 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res,
 
 	pbm->parent->resource_adjust(pdev, res, root);
 }
-EXPORT_SYMBOL(pcibios_bus_to_resource);
 
 char * __init pcibios_setup(char *str)
 {

trunk/arch/um/drivers/mmapper_kern.c

@@ -9,11 +9,19 @@
  *
  */
 
-#include <linux/init.h> 
+#include <linux/types.h>
+#include <linux/kdev_t.h>
+#include <linux/time.h>
+#include <linux/devfs_fs_kernel.h>
 #include <linux/module.h>
 #include <linux/mm.h> 
+#include <linux/slab.h>
+#include <linux/init.h> 
+#include <linux/smp_lock.h>
 #include <linux/miscdevice.h>
 #include <asm/uaccess.h>
+#include <asm/irq.h>
+#include <asm/pgtable.h>
 #include "mem_user.h"
 #include "user_util.h"
 
@@ -23,22 +31,35 @@ static unsigned long p_buf = 0;
 static char *v_buf = NULL;
 
 static ssize_t
-mmapper_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+mmapper_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	return simple_read_from_buffer(buf, count, ppos, v_buf, mmapper_size);
+	if(*ppos > mmapper_size)
+		return -EINVAL;
+
+	if(count + *ppos > mmapper_size)
+		count = count + *ppos - mmapper_size;
+
+	if(count < 0)
+		return -EINVAL;
+
+	copy_to_user(buf,&v_buf[*ppos],count);
+
+	return count;
 }
 
 static ssize_t
-mmapper_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+mmapper_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
-	if (*ppos > mmapper_size)
+	if(*ppos > mmapper_size)
 		return -EINVAL;
 
-	if (count > mmapper_size - *ppos)
-		count = mmapper_size - *ppos;
+	if(count + *ppos > mmapper_size)
+		count = count + *ppos - mmapper_size;
+
+	if(count < 0)
+		return -EINVAL;
 
-	if (copy_from_user(&v_buf[*ppos], buf, count))
-		return -EFAULT;
+	copy_from_user(&v_buf[*ppos],buf,count);
 
 	return count;
 }
@@ -56,6 +77,7 @@ mmapper_mmap(struct file *file, struct vm_area_struct * vma)
 	int ret = -EINVAL;
 	int size;
 
+	lock_kernel();
 	if (vma->vm_pgoff != 0)
 		goto out;
 
@@ -70,6 +92,7 @@ mmapper_mmap(struct file *file, struct vm_area_struct * vma)
 		goto out;
 	ret = 0;
 out:
+	unlock_kernel();
 	return ret;
 }
 

trunk/arch/x86_64/defconfig

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc6-git3
-# Fri Aug 12 16:40:34 2005
+# Linux kernel version: 2.6.13-rc3
+# Fri Jul 22 16:47:31 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -284,6 +284,10 @@ CONFIG_IPV6=y
 # Network testing
 #
 # CONFIG_NET_PKTGEN is not set
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
@@ -459,7 +463,6 @@ CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
-# CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 CONFIG_SCSI_ATA_PIIX=y
 # CONFIG_SCSI_SATA_NV is not set
@@ -489,7 +492,6 @@ CONFIG_SCSI_QLA2XXX=y
 # CONFIG_SCSI_QLA2300 is not set
 # CONFIG_SCSI_QLA2322 is not set
 # CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA24XX is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
@@ -510,11 +512,9 @@ CONFIG_BLK_DEV_DM=y
 #
 # Fusion MPT device support
 #
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=y
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
 # CONFIG_FUSION_FC is not set
-CONFIG_FUSION_MAX_SGE=128
-# CONFIG_FUSION_CTL is not set
 
 #
 # IEEE 1394 (FireWire) support
@@ -585,7 +585,6 @@ CONFIG_8139TOO=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
-# CONFIG_E1000_NAPI is not set
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
@@ -625,10 +624,6 @@ CONFIG_S2IO=m
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_RX is not set
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
 
 #
 # ISDN subsystem

trunk/arch/x86_64/kernel/e820.c

@@ -185,40 +185,6 @@ unsigned long __init e820_end_of_ram(void)
 }
 
 /* 
- * Compute how much memory is missing in a range.
- * Unlike the other functions in this file the arguments are in page numbers.
- */
-unsigned long __init
-e820_hole_size(unsigned long start_pfn, unsigned long end_pfn)
-{
-	unsigned long ram = 0;
-	unsigned long start = start_pfn << PAGE_SHIFT;
-	unsigned long end = end_pfn << PAGE_SHIFT;
-	int i;
-	for (i = 0; i < e820.nr_map; i++) {
-		struct e820entry *ei = &e820.map[i];
-		unsigned long last, addr;
-
-		if (ei->type != E820_RAM ||
-		    ei->addr+ei->size <= start ||
-		    ei->addr >= end)
-			continue;
-
-		addr = round_up(ei->addr, PAGE_SIZE);
-		if (addr < start)
-			addr = start;
-
-		last = round_down(ei->addr + ei->size, PAGE_SIZE);
-		if (last >= end)
-			last = end;
-
-		if (last > addr)
-			ram += last - addr;
-	}
-	return ((end - start) - ram) >> PAGE_SHIFT;
-}
-
-/*
  * Mark e820 reserved areas as busy for the resource manager.
  */
 void __init e820_reserve_resources(void)

trunk/arch/x86_64/mm/init.c

@@ -322,26 +322,18 @@ void zap_low_mappings(void)
 void __init paging_init(void)
 {
 	{
-		unsigned long zones_size[MAX_NR_ZONES];
-		unsigned long holes[MAX_NR_ZONES];
+		unsigned long zones_size[MAX_NR_ZONES] = {0, 0, 0};
 		unsigned int max_dma;
 
-		memset(zones_size, 0, sizeof(zones_size));
-		memset(holes, 0, sizeof(holes));
-
 		max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
 
-		if (end_pfn < max_dma) {
+		if (end_pfn < max_dma)
 			zones_size[ZONE_DMA] = end_pfn;
-			holes[ZONE_DMA] = e820_hole_size(0, end_pfn);
-		} else {
+		else {
 			zones_size[ZONE_DMA] = max_dma;
-			holes[ZONE_DMA] = e820_hole_size(0, max_dma);
 			zones_size[ZONE_NORMAL] = end_pfn - max_dma;
-			holes[ZONE_NORMAL] = e820_hole_size(max_dma, end_pfn);
 		}
-		free_area_init_node(0, NODE_DATA(0), zones_size,
-                        __pa(PAGE_OFFSET) >> PAGE_SHIFT, holes);
+		free_area_init(zones_size);
 	}
 	return;
 }

trunk/arch/x86_64/mm/numa.c

@@ -126,11 +126,9 @@ void __init setup_node_zones(int nodeid)
 { 
 	unsigned long start_pfn, end_pfn; 
 	unsigned long zones[MAX_NR_ZONES];
-	unsigned long holes[MAX_NR_ZONES];
 	unsigned long dma_end_pfn;
 
 	memset(zones, 0, sizeof(unsigned long) * MAX_NR_ZONES); 
-	memset(holes, 0, sizeof(unsigned long) * MAX_NR_ZONES);
 
 	start_pfn = node_start_pfn(nodeid);
 	end_pfn = node_end_pfn(nodeid);
@@ -141,17 +139,13 @@ void __init setup_node_zones(int nodeid)
 	dma_end_pfn = __pa(MAX_DMA_ADDRESS) >> PAGE_SHIFT; 
 	if (start_pfn < dma_end_pfn) { 
 		zones[ZONE_DMA] = dma_end_pfn - start_pfn;
-		holes[ZONE_DMA] = e820_hole_size(start_pfn, dma_end_pfn);
 		zones[ZONE_NORMAL] = end_pfn - dma_end_pfn; 
-		holes[ZONE_NORMAL] = e820_hole_size(dma_end_pfn, end_pfn);
-
 	} else { 
 		zones[ZONE_NORMAL] = end_pfn - start_pfn; 
-		holes[ZONE_NORMAL] = e820_hole_size(start_pfn, end_pfn);
 	} 
 
 	free_area_init_node(nodeid, NODE_DATA(nodeid), zones,
-			    start_pfn, holes);
+			    start_pfn, NULL); 
 } 
 
 void __init numa_init_array(void)

trunk/drivers/acpi/sleep/poweroff.c

@@ -55,11 +55,7 @@ void acpi_power_off(void)
 
 static int acpi_shutdown(struct sys_device *x)
 {
-	if (system_state == SYSTEM_POWER_OFF) {
-		/* Prepare if we are going to power off the system */
-		return acpi_sleep_prepare(ACPI_STATE_S5);
-	}
-	return 0;
+	return acpi_sleep_prepare(ACPI_STATE_S5);
 }
 
 static struct sysdev_class acpi_sysclass = {

trunk/drivers/block/cfq-iosched.c

@@ -47,7 +47,7 @@ static int cfq_slice_idle = HZ / 100;
 /*
  * disable queueing at the driver/hardware level
  */
-static int cfq_max_depth = 2;
+static int cfq_max_depth = 1;
 
 /*
  * for the hash of cfqq inside the cfqd
@@ -385,15 +385,9 @@ cfq_choose_req(struct cfq_data *cfqd, struct cfq_rq *crq1, struct cfq_rq *crq2)
 		return crq2;
 	if (crq2 == NULL)
 		return crq1;
-
-	if (cfq_crq_requeued(crq1) && !cfq_crq_requeued(crq2))
+	if (cfq_crq_requeued(crq1))
 		return crq1;
-	else if (cfq_crq_requeued(crq2) && !cfq_crq_requeued(crq1))
-		return crq2;
-
-	if (cfq_crq_is_sync(crq1) && !cfq_crq_is_sync(crq2))
-		return crq1;
-	else if (cfq_crq_is_sync(crq2) && !cfq_crq_is_sync(crq1))
+	if (cfq_crq_requeued(crq2))
 		return crq2;
 
 	s1 = crq1->request->sector;
@@ -1775,23 +1769,18 @@ static void
 cfq_crq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 		 struct cfq_rq *crq)
 {
-	struct cfq_io_context *cic;
+	const int sync = cfq_crq_is_sync(crq);
 
 	cfqq->next_crq = cfq_choose_req(cfqd, cfqq->next_crq, crq);
 
-	/*
-	 * we never wait for an async request and we don't allow preemption
-	 * of an async request. so just return early
-	 */
-	if (!cfq_crq_is_sync(crq))
-		return;
+	if (sync) {
+		struct cfq_io_context *cic = crq->io_context;
 
-	cic = crq->io_context;
+		cfq_update_io_thinktime(cfqd, cic);
+		cfq_update_idle_window(cfqd, cfqq, cic);
 
-	cfq_update_io_thinktime(cfqd, cic);
-	cfq_update_idle_window(cfqd, cfqq, cic);
-
-	cic->last_queue = jiffies;
+		cic->last_queue = jiffies;
+	}
 
 	if (cfqq == cfqd->active_queue) {
 		/*

trunk/drivers/char/vt.c

@@ -2433,7 +2433,7 @@ static int con_open(struct tty_struct *tty, struct file *filp)
 	int ret = 0;
 
 	acquire_console_sem();
-	if (tty->driver_data == NULL) {
+	if (tty->count == 1) {
 		ret = vc_allocate(currcons);
 		if (ret == 0) {
 			struct vc_data *vc = vc_cons[currcons].d;