---

yaml
---
r: 159216
b: refs/heads/master
c: 878fa89
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c685bfc6c6bcb9bcc42d1345a3650d3ce5185c52
+refs/heads/master: 878fa89f97954337d1dc41f0ccc3a8b5f89cfbc7

trunk/.gitignore

@@ -27,7 +27,6 @@
 *.gz
 *.lzma
 *.patch
-*.gcno
 
 #
 # Top-level generic files

trunk/CREDITS

@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
 
 N: Andreas Koensgen
-E: ajk@comnets.uni-bremen.de
+E: ajk@iehk.rwth-aachen.de
 D: 6pack driver for AX.25
 
 N: Harald Koerfgen

trunk/Documentation/DocBook/mac80211.tmpl

@@ -184,6 +184,8 @@ usage should require reading the full document.
 !Finclude/net/mac80211.h ieee80211_ctstoself_get
 !Finclude/net/mac80211.h ieee80211_ctstoself_duration
 !Finclude/net/mac80211.h ieee80211_generic_frame_duration
+!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb
+!Finclude/net/mac80211.h ieee80211_hdrlen
 !Finclude/net/mac80211.h ieee80211_wake_queue
 !Finclude/net/mac80211.h ieee80211_stop_queue
 !Finclude/net/mac80211.h ieee80211_wake_queues

trunk/Documentation/RCU/rculist_nulls.txt

@@ -83,12 +83,11 @@ not detect it missed following items in original chain.
 obj = kmem_cache_alloc(...);
 lock_chain(); // typically a spin_lock()
 obj->key = key;
+atomic_inc(&obj->refcnt);
 /*
  * we need to make sure obj->key is updated before obj->next
- * or obj->refcnt
  */
 smp_wmb();
-atomic_set(&obj->refcnt, 1);
 hlist_add_head_rcu(&obj->obj_node, list);
 unlock_chain(); // typically a spin_unlock()
 
@@ -160,10 +159,6 @@ out:
 obj = kmem_cache_alloc(cachep);
 lock_chain(); // typically a spin_lock()
 obj->key = key;
-/*
- * changes to obj->key must be visible before refcnt one
- */
-smp_wmb();
 atomic_set(&obj->refcnt, 1);
 /*
  * insert obj in RCU way (readers might be traversing chain)

trunk/Documentation/block/data-integrity.txt

@@ -50,7 +50,7 @@ encouraged them to allow separation of the data and integrity metadata
 scatter-gather lists.
 
 The controller will interleave the buffers on write and split them on
-read.  This means that Linux can DMA the data buffers to and from
+read.  This means that the Linux can DMA the data buffers to and from
 host memory without changes to the page cache.
 
 Also, the 16-bit CRC checksum mandated by both the SCSI and SATA specs
@@ -66,7 +66,7 @@ software RAID5).
 
 The IP checksum is weaker than the CRC in terms of detecting bit
 errors.  However, the strength is really in the separation of the data
-buffers and the integrity metadata.  These two distinct buffers must
+buffers and the integrity metadata.  These two distinct buffers much
 match up for an I/O to complete.
 
 The separation of the data and integrity metadata buffers as well as

trunk/Documentation/cgroups/cpusets.txt

@@ -777,18 +777,6 @@ in cpuset directories:
 # /bin/echo 1-4 > cpus		-> set cpus list to cpus 1,2,3,4
 # /bin/echo 1,2,3,4 > cpus	-> set cpus list to cpus 1,2,3,4
 
-To add a CPU to a cpuset, write the new list of CPUs including the
-CPU to be added. To add 6 to the above cpuset:
-
-# /bin/echo 1-4,6 > cpus	-> set cpus list to cpus 1,2,3,4,6
-
-Similarly to remove a CPU from a cpuset, write the new list of CPUs
-without the CPU to be removed.
-
-To remove all the CPUs:
-
-# /bin/echo "" > cpus		-> clear cpus list
-
 2.3 Setting flags
 -----------------
 

trunk/Documentation/connector/Makefile

@@ -9,8 +9,3 @@ hostprogs-y := ucon
 always := $(hostprogs-y)
 
 HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
-
-all: modules
-
-modules clean:
-	$(MAKE) -C ../.. SUBDIRS=$(PWD) $@

trunk/Documentation/connector/cn_test.c

@@ -1,7 +1,7 @@
 /*
  * 	cn_test.c
  * 
- * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net>
+ * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru>
  * All rights reserved.
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define pr_fmt(fmt) "cn_test: " fmt
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -29,17 +27,18 @@
 
 #include <linux/connector.h>
 
-static struct cb_id cn_test_id = { CN_NETLINK_USERS + 3, 0x456 };
+static struct cb_id cn_test_id = { 0x123, 0x456 };
 static char cn_test_name[] = "cn_test";
 static struct sock *nls;
 static struct timer_list cn_test_timer;
 
-static void cn_test_callback(struct cn_msg *msg)
+void cn_test_callback(void *data)
 {
-	pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",
-	        __func__, jiffies, msg->id.idx, msg->id.val,
-	        msg->seq, msg->ack, msg->len,
-	        msg->len ? (char *)msg->data : "");
+	struct cn_msg *msg = (struct cn_msg *)data;
+
+	printk("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",
+	       __func__, jiffies, msg->id.idx, msg->id.val,
+	       msg->seq, msg->ack, msg->len, (char *)msg->data);
 }
 
 /*
@@ -64,7 +63,9 @@ static int cn_test_want_notify(void)
 
 	skb = alloc_skb(size, GFP_ATOMIC);
 	if (!skb) {
-		pr_err("failed to allocate new skb with size=%u\n", size);
+		printk(KERN_ERR "Failed to allocate new skb with size=%u.\n",
+		       size);
+
 		return -ENOMEM;
 	}
 
@@ -113,12 +114,12 @@ static int cn_test_want_notify(void)
 	//netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);
 	netlink_unicast(nls, skb, 0, 0);
 
-	pr_info("request was sent: group=0x%x\n", ctl->group);
+	printk(KERN_INFO "Request was sent. Group=0x%x.\n", ctl->group);
 
 	return 0;
 
 nlmsg_failure:
-	pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
+	printk(KERN_ERR "Failed to send %u.%u\n", msg->seq, msg->ack);
 	kfree_skb(skb);
 	return -EINVAL;
 }
@@ -130,8 +131,6 @@ static void cn_test_timer_func(unsigned long __data)
 	struct cn_msg *m;
 	char data[32];
 
-	pr_debug("%s: timer fired with data %lu\n", __func__, __data);
-
 	m = kzalloc(sizeof(*m) + sizeof(data), GFP_ATOMIC);
 	if (m) {
 
@@ -151,7 +150,7 @@ static void cn_test_timer_func(unsigned long __data)
 
 	cn_test_timer_counter++;
 
-	mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
+	mod_timer(&cn_test_timer, jiffies + HZ);
 }
 
 static int cn_test_init(void)
@@ -169,10 +168,8 @@ static int cn_test_init(void)
 	}
 
 	setup_timer(&cn_test_timer, cn_test_timer_func, 0);
-	mod_timer(&cn_test_timer, jiffies + msecs_to_jiffies(1000));
-
-	pr_info("initialized with id={%u.%u}\n",
-		cn_test_id.idx, cn_test_id.val);
+	cn_test_timer.expires = jiffies + HZ;
+	add_timer(&cn_test_timer);
 
 	return 0;
 
@@ -197,5 +194,5 @@ module_init(cn_test_init);
 module_exit(cn_test_fini);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
+MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
 MODULE_DESCRIPTION("Connector's test module");