---

yaml
---
r: 75253
b: refs/heads/master
c: 58e6e78
h: refs/heads/master
i:
  75251: 25deb1a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39cd72de49032f1d9cd9166241ff4854a2cbb56b
+refs/heads/master: 58e6e78119da2bdade9f6f588155f0320072b76b

trunk/Documentation/nfsroot.txt

@@ -97,6 +97,10 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
   autoconfiguration will take place.  The most common way to use this
   is "ip=dhcp".
 
+  Note that "ip=off" is not the same thing as "ip=::::::off", because in
+  the latter autoconfiguration will take place if any of DHCP, BOOTP or RARP
+  are compiled in the kernel.
+
   <client-ip>	IP address of the client.
 
   		Default:  Determined using autoconfiguration.
@@ -146,7 +150,6 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
 
                   off or none: don't use autoconfiguration
 		  on or any:   use any protocol available in the kernel
-			       (default)
 		  dhcp:        use DHCP
 		  bootp:       use BOOTP
 		  rarp:        use RARP

trunk/MAINTAINERS

@@ -1870,10 +1870,8 @@ T:	quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:	Maintained
 
 IDE/ATAPI CDROM DRIVER
-P:	Borislav Petkov
-M:	bbpetkov@yahoo.de
 L:	linux-ide@vger.kernel.org
-S:	Maintained
+S:	Unmaintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:	Paul Bristow
@@ -2031,7 +2029,7 @@ P:	James Ketrenos
 M:	jketreno@linux.intel.com
 L:	linux-wireless@vger.kernel.org
 L:	ipw2100-devel@lists.sourceforge.net
-W:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:	http://ipw2100.sourceforge.net
 S:	Supported
 
@@ -2042,7 +2040,7 @@ P:	James Ketrenos
 M:	jketreno@linux.intel.com
 L:	linux-wireless@vger.kernel.org
 L:	ipw2100-devel@lists.sourceforge.net
-W:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+L:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:	http://ipw2200.sourceforge.net
 S:	Supported
 
@@ -2599,7 +2597,7 @@ S:	Maintained
 MSI LAPTOP SUPPORT
 P:	Lennart Poettering
 M:	mzxreary@0pointer.de
-W:	https://tango.0pointer.de/mailman/listinfo/s270-linux
+L:	https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:	http://0pointer.de/lennart/tchibo.html
 S:	Maintained
 
@@ -4056,14 +4054,6 @@ L:	user-mode-linux-user@lists.sourceforge.net
 W:	http://user-mode-linux.sourceforge.net
 S:	Maintained
 
-USERSPACE I/O (UIO)
-P:	Hans J. Koch
-M:	hjk@linutronix.de
-P:	Greg Kroah-Hartman
-M:	gregkh@suse.de
-L:	linux-kernel@vger.kernel.org
-S:	Maintained
-
 FAT/VFAT/MSDOS FILESYSTEM:
 P:	OGAWA Hirofumi
 M:	hirofumi@mail.parknet.co.jp

trunk/arch/powerpc/platforms/cell/Kconfig

@@ -88,8 +88,3 @@ config CBE_CPUFREQ_PMI
 	  but also at lower core voltage.
 
 endmenu
-
-config OPROFILE_CELL
-	def_bool y
-	depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)
-

trunk/arch/powerpc/platforms/cell/Makefile

@@ -19,7 +19,6 @@ spu-manage-$(CONFIG_PPC_CELLEB)		+= spu_manage.o
 spu-manage-$(CONFIG_PPC_CELL_NATIVE)	+= spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
-					   spu_notify.o \
 					   spu_syscalls.o \
 					   $(spu-priv1-y) \
 					   $(spu-manage-y) \

trunk/arch/powerpc/platforms/cell/spu_syscalls.c

@@ -145,20 +145,6 @@ int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset)
 	return ret;
 }
 
-void notify_spus_active(void)
-{
-	struct spufs_calls *calls;
-
-	calls = spufs_calls_get();
-	if (!calls)
-		return;
-
-	calls->notify_spus_active();
-	spufs_calls_put(calls);
-
-	return;
-}
-
 int register_spu_syscalls(struct spufs_calls *calls)
 {
 	if (spufs_calls)

trunk/arch/powerpc/platforms/cell/spufs/context.c

@@ -190,3 +190,19 @@ void spu_release_saved(struct spu_context *ctx)
 	spu_release(ctx);
 }
 
+void spu_set_profile_private_kref(struct spu_context *ctx,
+				  struct kref *prof_info_kref,
+				  void ( * prof_info_release) (struct kref *kref))
+{
+	ctx->prof_priv_kref = prof_info_kref;
+	ctx->prof_priv_release = prof_info_release;
+}
+EXPORT_SYMBOL_GPL(spu_set_profile_private_kref);
+
+void *spu_get_profile_private_kref(struct spu_context *ctx)
+{
+	return ctx->prof_priv_kref;
+}
+EXPORT_SYMBOL_GPL(spu_get_profile_private_kref);
+
+

trunk/arch/powerpc/platforms/cell/spufs/sched.c

@@ -166,7 +166,15 @@ static int node_allowed(struct spu_context *ctx, int node)
 	return rval;
 }
 
-void do_notify_spus_active(void)
+static BLOCKING_NOTIFIER_HEAD(spu_switch_notifier);
+
+void spu_switch_notify(struct spu *spu, struct spu_context *ctx)
+{
+	blocking_notifier_call_chain(&spu_switch_notifier,
+			    ctx ? ctx->object_id : 0, spu);
+}
+
+static void notify_spus_active(void)
 {
 	int node;
 
@@ -193,6 +201,22 @@ void do_notify_spus_active(void)
 	}
 }
 
+int spu_switch_event_register(struct notifier_block * n)
+{
+	int ret;
+	ret = blocking_notifier_chain_register(&spu_switch_notifier, n);
+	if (!ret)
+		notify_spus_active();
+	return ret;
+}
+EXPORT_SYMBOL_GPL(spu_switch_event_register);
+
+int spu_switch_event_unregister(struct notifier_block * n)
+{
+	return blocking_notifier_chain_unregister(&spu_switch_notifier, n);
+}
+EXPORT_SYMBOL_GPL(spu_switch_event_unregister);
+
 /**
  * spu_bind_context - bind spu context to physical spu
  * @spu:	physical spu to bind to

trunk/arch/powerpc/platforms/cell/spufs/syscalls.c

@@ -86,6 +86,5 @@ struct spufs_calls spufs_calls = {
 	.spu_run = do_spu_run,
 	.coredump_extra_notes_size = spufs_coredump_extra_notes_size,
 	.coredump_extra_notes_write = spufs_coredump_extra_notes_write,
-	.notify_spus_active = do_notify_spus_active,
 	.owner = THIS_MODULE,
 };

trunk/arch/powerpc/platforms/ps3/os-area.c

@@ -23,7 +23,6 @@
 #include <linux/workqueue.h>
 #include <linux/fs.h>
 #include <linux/syscalls.h>
-#include <linux/ctype.h>
 
 #include <asm/lmb.h>
 
@@ -38,8 +37,6 @@ enum os_area_ldr_format {
 	HEADER_LDR_FORMAT_GZIP = 1,
 };
 
-#define OS_AREA_HEADER_MAGIC_NUM "cell_ext_os_area"
-
 /**
  * struct os_area_header - os area header segment.
  * @magic_num: Always 'cell_ext_os_area'.
@@ -117,11 +114,13 @@ struct os_area_params {
 	u8 _reserved_5[8];
 };
 
-#define OS_AREA_DB_MAGIC_NUM "-db-"
+enum {
+	OS_AREA_DB_MAGIC_NUM = 0x2d64622dU,
+};
 
 /**
  * struct os_area_db - Shared flash memory database.
- * @magic_num: Always '-db-'.
+ * @magic_num: Always '-db-' = 0x2d64622d.
  * @version: os_area_db format version number.
  * @index_64: byte offset of the database id index for 64 bit variables.
  * @count_64: number of usable 64 bit index entries
@@ -136,7 +135,7 @@ struct os_area_params {
  */
 
 struct os_area_db {
-	u8 magic_num[4];
+	u32 magic_num;
 	u16 version;
 	u16 _reserved_1;
 	u16 index_64;
@@ -266,26 +265,12 @@ static void __init os_area_get_property(struct device_node *node,
 			prop->name);
 }
 
-static void dump_field(char *s, const u8 *field, int size_of_field)
-{
-#if defined(DEBUG)
-	int i;
-
-	for (i = 0; i < size_of_field; i++)
-		s[i] = isprint(field[i]) ? field[i] : '.';
-	s[i] = 0;
-#endif
-}
-
 #define dump_header(_a) _dump_header(_a, __func__, __LINE__)
 static void _dump_header(const struct os_area_header *h, const char *func,
 	int line)
 {
-	char str[sizeof(h->magic_num) + 1];
-
-	dump_field(str, h->magic_num, sizeof(h->magic_num));
 	pr_debug("%s:%d: h.magic_num:       '%s'\n", func, line,
-		str);
+		h->magic_num);
 	pr_debug("%s:%d: h.hdr_version:     %u\n", func, line,
 		h->hdr_version);
 	pr_debug("%s:%d: h.db_area_offset:  %u\n", func, line,
@@ -326,8 +311,7 @@ static void _dump_params(const struct os_area_params *p, const char *func,
 
 static int verify_header(const struct os_area_header *header)
 {
-	if (memcmp(header->magic_num, OS_AREA_HEADER_MAGIC_NUM,
-		sizeof(header->magic_num))) {
+	if (memcmp(header->magic_num, "cell_ext_os_area", 16)) {
 		pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
 		return -1;
 	}
@@ -347,8 +331,7 @@ static int verify_header(const struct os_area_header *header)
 
 static int db_verify(const struct os_area_db *db)
 {
-	if (memcmp(db->magic_num, OS_AREA_DB_MAGIC_NUM,
-		sizeof(db->magic_num))) {
+	if (db->magic_num != OS_AREA_DB_MAGIC_NUM) {
 		pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
 		return -1;
 	}
@@ -501,11 +484,8 @@ static int db_get_rtc_diff(const struct os_area_db *db, int64_t *rtc_diff)
 static void _dump_db(const struct os_area_db *db, const char *func,
 	int line)
 {
-	char str[sizeof(db->magic_num) + 1];
-
-	dump_field(str, db->magic_num, sizeof(db->magic_num));
 	pr_debug("%s:%d: db.magic_num:      '%s'\n", func, line,
-		str);
+		(const char*)&db->magic_num);
 	pr_debug("%s:%d: db.version:         %u\n", func, line,
 		db->version);
 	pr_debug("%s:%d: db.index_64:        %u\n", func, line,
@@ -536,7 +516,7 @@ static void os_area_db_init(struct os_area_db *db)
 
 	memset(db, 0, sizeof(struct os_area_db));
 
-	memcpy(db->magic_num, OS_AREA_DB_MAGIC_NUM, sizeof(db->magic_num));
+	db->magic_num = OS_AREA_DB_MAGIC_NUM;
 	db->version = 1;
 	db->index_64 = HEADER_SIZE;
 	db->count_64 = VALUES_64_COUNT;

trunk/arch/sparc/kernel/ptrace.c

@@ -5,7 +5,7 @@
  * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
  * and David Mosberger.
  *
- * Added Linux support -miguel (weird, eh?, the original code was meant
+ * Added Linux support -miguel (weird, eh?, the orignal code was meant
  * to emulate SunOS).
  */
 

trunk/arch/sparc64/kernel/pci.c

@@ -1275,20 +1275,4 @@ int pci_dma_supported(struct pci_dev *pdev, u64 device_mask)
 	return (device_mask & dma_addr_mask) == dma_addr_mask;
 }
 
-void pci_resource_to_user(const struct pci_dev *pdev, int bar,
-			  const struct resource *rp, resource_size_t *start,
-			  resource_size_t *end)
-{
-	struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
-	unsigned long offset;
-
-	if (rp->flags & IORESOURCE_IO)
-		offset = pbm->io_space.start;
-	else
-		offset = pbm->mem_space.start;
-
-	*start = rp->start - offset;
-	*end = rp->end - offset;
-}
-
 #endif /* !(CONFIG_PCI) */