---

yaml --- r: 200250 b: refs/heads/master c: ffe57d0 h: refs/heads/master v: v3
git-mirror · Jun 9, 2010 · c3b3086 · c3b3086
1 parent b284a21
commit c3b3086
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79907d89c397b8bc2e05b347ec94e928ea919d33
+refs/heads/master: ffe57d02b23ebc5422cf81566b3ce566d68a3e22
diff --git a/trunk/arch/microblaze/include/asm/page.h b/trunk/arch/microblaze/include/asm/page.h
@@ -34,6 +34,8 @@
 /* MS be sure that SLAB allocates aligned objects */
 #define ARCH_KMALLOC_MINALIGN	L1_CACHE_BYTES
 
+#define ARCH_SLAB_MINALIGN	L1_CACHE_BYTES
+
 #define PAGE_UP(addr)	(((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
 #define PAGE_DOWN(addr)	((addr)&(~((PAGE_SIZE)-1)))
 

diff --git a/trunk/drivers/vhost/net.c b/trunk/drivers/vhost/net.c
@@ -637,7 +637,7 @@ const static struct file_operations vhost_net_fops = {
 };
 
 static struct miscdevice vhost_net_misc = {
-	MISC_DYNAMIC_MINOR,
+	VHOST_NET_MINOR,
 	"vhost-net",
 	&vhost_net_fops,
 };

diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h
@@ -3,12 +3,6 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
-/*
- *	These allocations are managed by device@lanana.org. If you use an
- *	entry that is not in assigned your entry may well be moved and
- *	reassigned, or set dynamic if a fixed value is not justified.
- */
-
 #define PSMOUSE_MINOR		1
 #define MS_BUSMOUSE_MINOR	2
 #define ATIXL_BUSMOUSE_MINOR	3
@@ -36,6 +30,7 @@
 #define HPET_MINOR		228
 #define FUSE_MINOR		229
 #define KVM_MINOR		232
+#define VHOST_NET_MINOR		233
 #define BTRFS_MINOR		234
 #define AUTOFS_MINOR		235
 #define MISC_DYNAMIC_MINOR	255