Skip to contentSkip to conversation

arch/microblaze fixes

GIT PULL Michal Simek 1 participant 1 message Apr 14, 2009

Subsystems (3)
lore
Share & tools
lore

Michal Simek

author maintainer
#0 lore raw

Hi Linus,

here are fixes for Microblaze cpu. Please pull them before rc2 tag.

Thanks,
Michal

The following changes since commit 8371f87c9994d9942af5984309835aeb948ba579:
Linus Torvalds (1):
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

are available in the git repository at:

git://git.monstr.eu/linux-2.6-microblaze.git fixes-for-linus

Huang Weiyi (1):
microblaze: remove duplicated #include's

Michal Simek (6):
microblaze: Fix problem with removing zero length files
microblaze: Add missing empty ftrace.h file
microblaze: Add TIMESTAMPING constants to socket.h
microblaze: Simplify copy_thread()
microblaze: struct device - replace bus_id with dev_name()
microblaze: Add missing FILE tag to MAINTAINERS

 MAINTAINERS                             |    1 +
 arch/microblaze/include/asm/auxvec.h    |    1 +
 arch/microblaze/include/asm/cputable.h  |    1 +
 arch/microblaze/include/asm/ftrace.h    |    1 +
 arch/microblaze/include/asm/hw_irq.h    |    1 +
 arch/microblaze/include/asm/io.h        |    1 -
 arch/microblaze/include/asm/socket.h    |    3 +++
 arch/microblaze/include/asm/user.h      |    1 +
 arch/microblaze/include/asm/vga.h       |    1 +
 arch/microblaze/kernel/of_device.c      |   10 ++++------
 arch/microblaze/kernel/process.c        |    3 +--
 arch/microblaze/kernel/prom.c           |    1 -
 arch/microblaze/kernel/ptrace.c         |    1 -
 arch/microblaze/kernel/signal.c         |    1 -
 arch/microblaze/kernel/sys_microblaze.c |    2 --
 15 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 arch/microblaze/include/asm/ftrace.h
MAINTAINERS +1 -0
index ca2997a..782ea4f 100644
@@ -3680,6 +3680,7 @@ L:	[email protected]
 W:	http://www.monstr.eu/fdt/
 T:	git git://git.monstr.eu/linux-2.6-microblaze.git
 S:	Supported
+F:	arch/microblaze/
 
 MICROTEK X6 SCANNER
 P:	Oliver Neukum
arch/microblaze/include/asm/auxvec.h +1 -0
index e69de29..8b13789 100644
@@ -0,0 +1 @@
+
arch/microblaze/include/asm/cputable.h +1 -0
index e69de29..8b13789 100644
@@ -0,0 +1 @@
+
arch/microblaze/include/asm/ftrace.h new file +1 -0
new file mode 100644
index 0000000..8b13789
@@ -0,0 +1 @@
+
arch/microblaze/include/asm/hw_irq.h +1 -0
index e69de29..8b13789 100644
@@ -0,0 +1 @@
+
arch/microblaze/include/asm/io.h +0 -1
index cfab034..8b5853e 100644
@@ -12,7 +12,6 @@
 #include <asm/byteorder.h>
 #include <asm/page.h>
 #include <linux/types.h>
-#include <asm/page.h>
 
 #define IO_SPACE_LIMIT (0xFFFFFFFF)
 
arch/microblaze/include/asm/socket.h +3 -0
index f919b6b..8259368 100644
@@ -63,4 +63,7 @@
 
 #define SO_MARK			36
 
+#define SO_TIMESTAMPING		37
+#define SCM_TIMESTAMPING	SO_TIMESTAMPING
+
 #endif /* _ASM_MICROBLAZE_SOCKET_H */
arch/microblaze/include/asm/user.h +1 -0
index e69de29..8b13789 100644
@@ -0,0 +1 @@
+
arch/microblaze/include/asm/vga.h +1 -0
index e69de29..8b13789 100644
@@ -0,0 +1 @@
+
arch/microblaze/kernel/of_device.c +4 -6
index 717edf4..9a0f763 100644
@@ -13,7 +13,6 @@ void of_device_make_bus_id(struct of_device *dev)
 {
 	static atomic_t bus_no_reg_magic;
 	struct device_node *node = dev->node;
-	char *name = dev->dev.bus_id;
 	const u32 *reg;
 	u64 addr;
 	int magic;
@@ -25,9 +24,8 @@ void of_device_make_bus_id(struct of_device *dev)
 	if (reg) {
 		addr = of_translate_address(node, reg);
 		if (addr != OF_BAD_ADDR) {
-			snprintf(name, BUS_ID_SIZE,
-				 "%llx.%s", (unsigned long long)addr,
-				 node->name);
+			dev_set_name(&dev->dev, "%llx.%s",
+				     (unsigned long long)addr, node->name);
 			return;
 		}
 	}
@@ -37,7 +35,7 @@ void of_device_make_bus_id(struct of_device *dev)
 	 * counter (and pray...)
 	 */
 	magic = atomic_add_return(1, &bus_no_reg_magic);
-	snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1);
+	dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1);
 }
 EXPORT_SYMBOL(of_device_make_bus_id);
 
@@ -58,7 +56,7 @@ struct of_device *of_device_alloc(struct device_node *np,
 	dev->dev.archdata.of_node = np;
 
 	if (bus_id)
-		strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
+		dev_set_name(&dev->dev, bus_id);
 	else
 		of_device_make_bus_id(dev);
 
arch/microblaze/kernel/process.c +1 -2
index 60e9ed7..436f26c 100644
@@ -115,8 +115,7 @@ void flush_thread(void)
 {
 }
 
-/* FIXME - here will be a proposed change -> remove nr parameter */
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
 		unsigned long unused,
 		struct task_struct *p, struct pt_regs *regs)
 {
arch/microblaze/kernel/prom.c +0 -1
index 475b1fa..34c4871 100644
@@ -39,7 +39,6 @@
 #include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <linux/pci.h>
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
 
arch/microblaze/kernel/ptrace.c +0 -1
index 3171e39..b86aa62 100644
@@ -32,7 +32,6 @@
 #include <linux/signal.h>
 
 #include <linux/errno.h>
-#include <linux/ptrace.h>
 #include <asm/processor.h>
 #include <linux/uaccess.h>
 #include <asm/asm-offsets.h>
arch/microblaze/kernel/signal.c +0 -1
index ff347b9..3889cf4 100644
@@ -37,7 +37,6 @@
 #include <linux/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
-#include <linux/signal.h>
 #include <linux/syscalls.h>
 #include <asm/cacheflush.h>
 #include <asm/syscalls.h>
arch/microblaze/kernel/sys_microblaze.c +0 -2
index d90b548..ba0568c 100644
@@ -29,9 +29,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/fs.h>
-#include <linux/ipc.h>
 #include <linux/semaphore.h>
-#include <linux/syscalls.h>
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
 
Signature · 2 lines
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854