---

yaml
---
r: 35557
b: refs/heads/master
c: c32a8fd
h: refs/heads/master
i:
  35555: ef22c27
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e4720201ad44ace85a443f41d668a62a737e7d0
+refs/heads/master: c32a8fd7cb33f30bcd855188dc8e243b144c5cee

trunk/Documentation/networking/dccp.txt

@@ -1,6 +1,7 @@
 DCCP protocol
 ============
 
+Last updated: 10 November 2005
 
 Contents
 ========
@@ -41,11 +42,8 @@ Socket options
 DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
 calculations.
 
-DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of
-service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,
-the socket will fall back to 0 (which means that no meaningful service code
-is present). Connecting sockets set at most one service option; for
-listening sockets, multiple service codes can be specified.
+DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
+specification. If you don't set it you will get EPROTO.
 
 Notes
 =====

trunk/MAINTAINERS

@@ -2031,13 +2031,6 @@ L:	netfilter@lists.netfilter.org
 L:	netfilter-devel@lists.netfilter.org
 S:	Supported
 
-NETLABEL
-P:	Paul Moore
-M:	paul.moore@hp.com
-W:	http://netlabel.sf.net
-L:	netdev@vger.kernel.org
-S:	Supported
-
 NETROM NETWORK LAYER
 P:	Ralf Baechle
 M:	ralf@linux-mips.org

trunk/arch/i386/kernel/smpboot.c

@@ -642,13 +642,9 @@ static void map_cpu_to_logical_apicid(void)
 {
 	int cpu = smp_processor_id();
 	int apicid = logical_smp_processor_id();
-	int node = apicid_to_node(apicid);
-
-	if (!node_online(node))
-		node = first_online_node;
 
 	cpu_2_logical_apicid[cpu] = apicid;
-	map_cpu_to_node(cpu, node);
+	map_cpu_to_node(cpu, apicid_to_node(apicid));
 }
 
 static void unmap_cpu_to_logical_apicid(int cpu)

trunk/arch/i386/mm/boot_ioremap.c

@@ -29,11 +29,8 @@
  */
 
 #define BOOT_PTE_PTRS (PTRS_PER_PTE*2)
-
-static unsigned long boot_pte_index(unsigned long vaddr) 
-{
-	return __pa(vaddr) >> PAGE_SHIFT;
-}
+#define boot_pte_index(address) \
+	     (((address) >> PAGE_SHIFT) & (BOOT_PTE_PTRS - 1))
 
 static inline boot_pte_t* boot_vaddr_to_pte(void *address)
 {

trunk/arch/ia64/kernel/acpi.c

@@ -771,19 +771,16 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)
 {
 #ifdef CONFIG_ACPI_NUMA
 	int pxm_id;
-	int nid;
 
 	pxm_id = acpi_get_pxm(handle);
+
 	/*
-	 * We don't have cpu-only-node hotadd. But if the system equips
-	 * SRAT table, pxm is already found and node is ready.
-  	 * So, just pxm_to_nid(pxm) is OK.
-	 * This code here is for the system which doesn't have full SRAT
-  	 * table for possible cpus.
+	 * Assuming that the container driver would have set the proximity
+	 * domain and would have initialized pxm_to_node(pxm_id) && pxm_flag
 	 */
-	nid = acpi_map_pxm_to_node(pxm_id);
+	node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_node(pxm_id);
+
 	node_cpuid[cpu].phys_id = physid;
-	node_cpuid[cpu].nid = nid;
 #endif
 	return (0);
 }

trunk/arch/ia64/kernel/numa.c

@@ -29,36 +29,6 @@ EXPORT_SYMBOL(cpu_to_node_map);
 
 cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 
-void __cpuinit map_cpu_to_node(int cpu, int nid)
-{
-	int oldnid;
-	if (nid < 0) { /* just initialize by zero */
-		cpu_to_node_map[cpu] = 0;
-		return;
-	}
-	/* sanity check first */
-	oldnid = cpu_to_node_map[cpu];
-	if (cpu_isset(cpu, node_to_cpu_mask[oldnid])) {
-		return; /* nothing to do */
-	}
-	/* we don't have cpu-driven node hot add yet...
-	   In usual case, node is created from SRAT at boot time. */
-	if (!node_online(nid))
-		nid = first_online_node;
-	cpu_to_node_map[cpu] = nid;
-	cpu_set(cpu, node_to_cpu_mask[nid]);
-	return;
-}
-
-void __cpuinit unmap_cpu_from_node(int cpu, int nid)
-{
-	WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));
-	WARN_ON(cpu_to_node_map[cpu] != nid);
-	cpu_to_node_map[cpu] = 0;
-	cpu_clear(cpu, node_to_cpu_mask[nid]);
-}
-
-
 /**
  * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
  *
@@ -79,6 +49,8 @@ void __init build_cpu_to_node_map(void)
 				node = node_cpuid[i].nid;
 				break;
 			}
-		map_cpu_to_node(cpu, node);
+		cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
+		if (node >= 0)
+			cpu_set(cpu, node_to_cpu_mask[node]);
 	}
 }

trunk/arch/ia64/kernel/topology.c

@@ -36,9 +36,6 @@ int arch_register_cpu(int num)
 	 */
 	if (!can_cpei_retarget() && is_cpu_cpei_target(num))
 		sysfs_cpus[num].cpu.no_control = 1;
-#ifdef CONFIG_NUMA
-	map_cpu_to_node(num, node_cpuid[num].nid);
-#endif
 #endif
 
 	return register_cpu(&sysfs_cpus[num].cpu, num);
@@ -48,8 +45,7 @@ int arch_register_cpu(int num)
 
 void arch_unregister_cpu(int num)
 {
-	unregister_cpu(&sysfs_cpus[num].cpu);
-	unmap_cpu_from_node(num, cpu_to_node(num));
+	return unregister_cpu(&sysfs_cpus[num].cpu);
 }
 EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);

trunk/arch/sparc64/solaris/misc.c

@@ -736,23 +736,28 @@ struct exec_domain solaris_exec_domain = {
 
 extern int init_socksys(void);
 
+#ifdef MODULE
+
 MODULE_AUTHOR("Jakub Jelinek (jj@ultra.linux.cz), Patrik Rak (prak3264@ss1000.ms.mff.cuni.cz)");
 MODULE_DESCRIPTION("Solaris binary emulation module");
 MODULE_LICENSE("GPL");
 
+#ifdef __sparc_v9__
 extern u32 tl0_solaris[8];
 #define update_ttable(x) 										\
 	tl0_solaris[3] = (((long)(x) - (long)tl0_solaris - 3) >> 2) | 0x40000000;			\
 	wmb();		\
 	__asm__ __volatile__ ("flush %0" : : "r" (&tl0_solaris[3]))
+#else
+#endif	
 
 extern u32 solaris_sparc_syscall[];
 extern u32 solaris_syscall[];
 extern void cleanup_socksys(void);
 
 extern u32 entry64_personality_patch;
 
-static int __init solaris_init(void)
+int init_module(void)
 {
 	int ret;
 
@@ -772,12 +777,19 @@ static int __init solaris_init(void)
 	return 0;
 }
 
-static void __exit solaris_exit(void)
+void cleanup_module(void)
 {
 	update_ttable(solaris_syscall);
 	cleanup_socksys();
 	unregister_exec_domain(&solaris_exec_domain);
 }
 
-module_init(solaris_init);
-module_exit(solaris_exit);
+#else
+int init_solaris_emul(void)
+{
+	register_exec_domain(&solaris_exec_domain);
+	init_socksys();
+	return 0;
+}
+#endif
+

trunk/arch/sparc64/solaris/socksys.c

@@ -168,7 +168,8 @@ static struct file_operations socksys_fops = {
 	.release =	socksys_release,
 };
 
-int __init init_socksys(void)
+int __init
+init_socksys(void)
 {
 	int ret;
 	struct file * file;
@@ -198,7 +199,8 @@ int __init init_socksys(void)
 	return 0;
 }
 
-void __exit cleanup_socksys(void)
+void
+cleanup_socksys(void)
 {
 	if (unregister_chrdev(30, "socksys"))
 		printk ("Couldn't unregister socksys character device\n");

trunk/drivers/ata/ata_piix.c

@@ -851,7 +851,7 @@ static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev)
  *	@ap: Port whose timings we are configuring
  *	@adev: Drive in question
  *	@udma: udma mode, 0 - 6
- *	@is_ich: set if the chip is an ICH device
+ *	@isich: set if the chip is an ICH device
  *
  *	Set UDMA mode for device, in host controller PCI config space.
  *

trunk/drivers/atm/he.c

@@ -454,7 +454,7 @@ rate_to_atmf(unsigned rate)		/* cps to atm forum format */
 	return (NONZERO | (exp << 9) | (rate & 0x1ff));
 }
 
-static void __devinit
+static void __init
 he_init_rx_lbfp0(struct he_dev *he_dev)
 {
 	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -485,7 +485,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev)
 	he_writel(he_dev, he_dev->r0_numbuffs, RLBF0_C);
 }
 
-static void __devinit
+static void __init
 he_init_rx_lbfp1(struct he_dev *he_dev)
 {
 	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -516,7 +516,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev)
 	he_writel(he_dev, he_dev->r1_numbuffs, RLBF1_C);
 }
 
-static void __devinit
+static void __init
 he_init_tx_lbfp(struct he_dev *he_dev)
 {
 	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -546,7 +546,7 @@ he_init_tx_lbfp(struct he_dev *he_dev)
 	he_writel(he_dev, lbufd_index - 1, TLBF_T);
 }
 
-static int __devinit
+static int __init
 he_init_tpdrq(struct he_dev *he_dev)
 {
 	he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
@@ -568,7 +568,7 @@ he_init_tpdrq(struct he_dev *he_dev)
 	return 0;
 }
 
-static void __devinit
+static void __init
 he_init_cs_block(struct he_dev *he_dev)
 {
 	unsigned clock, rate, delta;
@@ -664,7 +664,7 @@ he_init_cs_block(struct he_dev *he_dev)
 
 }
 
-static int __devinit
+static int __init
 he_init_cs_block_rcm(struct he_dev *he_dev)
 {
 	unsigned (*rategrid)[16][16];
@@ -785,7 +785,7 @@ he_init_cs_block_rcm(struct he_dev *he_dev)
 	return 0;
 }
 
-static int __devinit
+static int __init
 he_init_group(struct he_dev *he_dev, int group)
 {
 	int i;
@@ -955,7 +955,7 @@ he_init_group(struct he_dev *he_dev, int group)
 	return 0;
 }
 
-static int __devinit
+static int __init
 he_init_irq(struct he_dev *he_dev)
 {
 	int i;

trunk/drivers/char/rtc.c

@@ -209,12 +209,11 @@ static const unsigned char days_in_mo[] =
  */
 static inline unsigned char rtc_is_updating(void)
 {
-	unsigned long flags;
 	unsigned char uip;
 
-	spin_lock_irqsave(&rtc_lock, flags);
+	spin_lock_irq(&rtc_lock);
 	uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
-	spin_unlock_irqrestore(&rtc_lock, flags);
+	spin_unlock_irq(&rtc_lock);
 	return uip;
 }
 

trunk/drivers/media/video/videodev.c

@@ -836,7 +836,7 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
 			break;
 		}
 
-		if (index < 0 || index >= vfd->tvnormsize) {
+		if (index<=0 || index >= vfd->tvnormsize) {
 			ret=-EINVAL;
 			break;
 		}

trunk/drivers/net/sunlance.c

@@ -1323,9 +1323,9 @@ static const struct ethtool_ops sparc_lance_ethtool_ops = {
 	.get_link		= sparc_lance_get_link,
 };
 
-static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
-					   struct sbus_dma *ledma,
-					   struct sbus_dev *lebuffer)
+static int __init sparc_lance_probe_one(struct sbus_dev *sdev,
+					struct sbus_dma *ledma,
+					struct sbus_dev *lebuffer)
 {
 	static unsigned version_printed;
 	struct net_device *dev;
@@ -1515,7 +1515,7 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
 }
 
 /* On 4m, find the associated dma for the lance chip */
-static struct sbus_dma * __devinit find_ledma(struct sbus_dev *sdev)
+static inline struct sbus_dma *find_ledma(struct sbus_dev *sdev)
 {
 	struct sbus_dma *p;
 
@@ -1533,7 +1533,7 @@ static struct sbus_dma * __devinit find_ledma(struct sbus_dev *sdev)
 
 /* Find all the lance cards on the system and initialize them */
 static struct sbus_dev sun4_sdev;
-static int __devinit sparc_lance_init(void)
+static int __init sparc_lance_init(void)
 {
 	if ((idprom->id_machtype == (SM_SUN4|SM_4_330)) ||
 	    (idprom->id_machtype == (SM_SUN4|SM_4_470))) {

trunk/drivers/video/fbsysfs.c

@@ -397,12 +397,6 @@ static ssize_t store_bl_curve(struct class_device *class_device,
 	u8 tmp_curve[FB_BACKLIGHT_LEVELS];
 	unsigned int i;
 
-	/* Some drivers don't use framebuffer_alloc(), but those also
-	 * don't have backlights.
-	 */
-	if (!fb_info || !fb_info->bl_dev)
-		return -ENODEV;
-
 	if (count != (FB_BACKLIGHT_LEVELS / 8 * 24))
 		return -EINVAL;
 
@@ -436,12 +430,6 @@ static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
 	ssize_t len = 0;
 	unsigned int i;
 
-	/* Some drivers don't use framebuffer_alloc(), but those also
-	 * don't have backlights.
-	 */
-	if (!fb_info || !fb_info->bl_dev)
-		return -ENODEV;
-
 	mutex_lock(&fb_info->bl_mutex);
 	for (i = 0; i < FB_BACKLIGHT_LEVELS; i += 8)
 		len += snprintf(&buf[len], PAGE_SIZE,