From 5a9bd51810bce6ac79b65f07116035b6b217986e Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 13 Apr 2009 20:51:22 +0200 Subject: microblaze: Fix problem with removing zero length files Adding one new line was recommended solution. Test with make distclean Tested-by: Jeff Garzik Signed-off-by: Michal Simek --- arch/microblaze/include/asm/auxvec.h | 1 + arch/microblaze/include/asm/cputable.h | 1 + arch/microblaze/include/asm/hw_irq.h | 1 + arch/microblaze/include/asm/user.h | 1 + arch/microblaze/include/asm/vga.h | 1 + 5 files changed, 5 insertions(+) diff --git a/arch/microblaze/include/asm/auxvec.h b/arch/microblaze/include/asm/auxvec.h index e69de29bb2d..8b137891791 100644 --- a/arch/microblaze/include/asm/auxvec.h +++ b/arch/microblaze/include/asm/auxvec.h @@ -0,0 +1 @@ + diff --git a/arch/microblaze/include/asm/cputable.h b/arch/microblaze/include/asm/cputable.h index e69de29bb2d..8b137891791 100644 --- a/arch/microblaze/include/asm/cputable.h +++ b/arch/microblaze/include/asm/cputable.h @@ -0,0 +1 @@ + diff --git a/arch/microblaze/include/asm/hw_irq.h b/arch/microblaze/include/asm/hw_irq.h index e69de29bb2d..8b137891791 100644 --- a/arch/microblaze/include/asm/hw_irq.h +++ b/arch/microblaze/include/asm/hw_irq.h @@ -0,0 +1 @@ + diff --git a/arch/microblaze/include/asm/user.h b/arch/microblaze/include/asm/user.h index e69de29bb2d..8b137891791 100644 --- a/arch/microblaze/include/asm/user.h +++ b/arch/microblaze/include/asm/user.h @@ -0,0 +1 @@ + diff --git a/arch/microblaze/include/asm/vga.h b/arch/microblaze/include/asm/vga.h index e69de29bb2d..8b137891791 100644 --- a/arch/microblaze/include/asm/vga.h +++ b/arch/microblaze/include/asm/vga.h @@ -0,0 +1 @@ + -- cgit v1.2.3 From 6c149fd7cda601ebd178dd2f07ccff6bb0d010cf Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Apr 2009 08:37:30 +0200 Subject: microblaze: Add missing empty ftrace.h file Signed-off-by: Michal Simek --- arch/microblaze/include/asm/ftrace.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 arch/microblaze/include/asm/ftrace.h diff --git a/arch/microblaze/include/asm/ftrace.h b/arch/microblaze/include/asm/ftrace.h new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/arch/microblaze/include/asm/ftrace.h @@ -0,0 +1 @@ + -- cgit v1.2.3 From 39141bfcad22e6d7393c0d0f81b2e180db6983df Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Apr 2009 09:16:01 +0200 Subject: microblaze: Add TIMESTAMPING constants to socket.h This changes was introduce with commit: cb9eff097831007afb30d64373f29d99825d0068 net: new user space API for time stamping of incoming and outgoing packets Signed-off-by: Michal Simek --- arch/microblaze/include/asm/socket.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/microblaze/include/asm/socket.h b/arch/microblaze/include/asm/socket.h index f919b6b540a..82593686031 100644 --- a/arch/microblaze/include/asm/socket.h +++ b/arch/microblaze/include/asm/socket.h @@ -63,4 +63,7 @@ #define SO_MARK 36 +#define SO_TIMESTAMPING 37 +#define SCM_TIMESTAMPING SO_TIMESTAMPING + #endif /* _ASM_MICROBLAZE_SOCKET_H */ -- cgit v1.2.3 From a8fb748e89957426fafb2e2efccd5ce635d6f530 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Apr 2009 09:18:19 +0200 Subject: microblaze: Simplify copy_thread() Removing nr parameter from copy_tread function commit 6f2c55b843836d26528c56a0968689accaedbc67 Signed-off-by: Michal Simek --- arch/microblaze/kernel/process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c index 60e9ed7d313..436f26ccbfa 100644 --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c @@ -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) { -- cgit v1.2.3 From 5a86dc1a749211fd87341ee7943f985cde71ea11 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Apr 2009 09:38:06 +0200 Subject: microblaze: struct device - replace bus_id with dev_name() Signed-off-by: Michal Simek --- arch/microblaze/kernel/of_device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c index 717edf4ad0b..9a0f7632c47 100644 --- a/arch/microblaze/kernel/of_device.c +++ b/arch/microblaze/kernel/of_device.c @@ -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); -- cgit v1.2.3 From 00300d6746b96ca9dba100ea9ea8d01737cc9a4d Mon Sep 17 00:00:00 2001 From: Huang Weiyi Date: Tue, 14 Apr 2009 06:56:15 +0800 Subject: microblaze: remove duplicated #include's Remove duplicated #include's in arch/microblaze/include/asm/io.h arch/microblaze/kernel/prom.c arch/microblaze/kernel/ptrace.c arch/microblaze/kernel/signal.c arch/microblaze/kernel/sys_microblaze.c Signed-off-by: Huang Weiyi Signed-off-by: Michal Simek --- arch/microblaze/include/asm/io.h | 1 - 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 -- 5 files changed, 6 deletions(-) diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index cfab0342588..8b5853ee6b5 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -12,7 +12,6 @@ #include #include #include -#include #define IO_SPACE_LIMIT (0xFFFFFFFF) diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 475b1fac5cf..34c48718061 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c index 3171e39e322..b86aa623e36 100644 --- a/arch/microblaze/kernel/ptrace.c +++ b/arch/microblaze/kernel/ptrace.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index ff347b98863..3889cf45fa7 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index d90b548fb1b..ba0568c2cc1 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c @@ -29,9 +29,7 @@ #include #include #include -#include #include -#include #include #include -- cgit v1.2.3 From 0a8c791437db4937bd160570f594d0286d3dd78d Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 14 Apr 2009 11:38:57 +0200 Subject: microblaze: Add missing FILE tag to MAINTAINERS Signed-off-by: Michal Simek --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index ca2997a4576..782ea4f0ca2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3680,6 +3680,7 @@ L: microblaze-uclinux@itee.uq.edu.au 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 -- cgit v1.2.3