AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze

Browse Source 
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add missing FILE tag to MAINTAINERS
  microblaze: remove duplicated #include's
  microblaze: struct device - replace bus_id with dev_name()
  microblaze: Simplify copy_thread()
  microblaze: Add TIMESTAMPING constants to socket.h
  microblaze: Add missing empty ftrace.h file
  microblaze: Fix problem with removing zero length files
This commit is contained in:
Linus Torvalds 2009-04-14 10:10:16 -07:00
commit 2b6b6d385d
15 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -3680,6 +3680,7 @@ L: microblaze-uclinux@itee.uq.edu.au
W: http://www.monstr.eu/fdt/ W: http://www.monstr.eu/fdt/
T: git git://git.monstr.eu/linux-2.6-microblaze.git T: git git://git.monstr.eu/linux-2.6-microblaze.git
S: Supported S: Supported
F: arch/microblaze/
MICROTEK X6 SCANNER MICROTEK X6 SCANNER
P: Oliver Neukum P: Oliver Neukum

1
arch/microblaze/include/asm/auxvec.h
View File

@ -0,0 +1 @@

1
arch/microblaze/include/asm/cputable.h
View File

@ -0,0 +1 @@

1
arch/microblaze/include/asm/ftrace.h Normal file
View File

@ -0,0 +1 @@

1
arch/microblaze/include/asm/hw_irq.h
View File

@ -0,0 +1 @@

1
arch/microblaze/include/asm/io.h
View File

@ -12,7 +12,6 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/page.h> #include <asm/page.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/page.h>
#define IO_SPACE_LIMIT (0xFFFFFFFF) #define IO_SPACE_LIMIT (0xFFFFFFFF)

3
arch/microblaze/include/asm/socket.h
View File

@ -63,4 +63,7 @@
#define SO_MARK 36 #define SO_MARK 36
#define SO_TIMESTAMPING 37
#define SCM_TIMESTAMPING SO_TIMESTAMPING
#endif /* _ASM_MICROBLAZE_SOCKET_H */ #endif /* _ASM_MICROBLAZE_SOCKET_H */

1
arch/microblaze/include/asm/user.h
View File

@ -0,0 +1 @@

1
arch/microblaze/include/asm/vga.h
View File

@ -0,0 +1 @@

10
arch/microblaze/kernel/of_device.c
View File

@ -13,7 +13,6 @@ void of_device_make_bus_id(struct of_device *dev)
{ {
static atomic_t bus_no_reg_magic; static atomic_t bus_no_reg_magic;
struct device_node *node = dev->node; struct device_node *node = dev->node;
char *name = dev->dev.bus_id;
const u32 *reg; const u32 *reg;
u64 addr; u64 addr;
int magic; int magic;
@ -25,9 +24,8 @@ void of_device_make_bus_id(struct of_device *dev)
if (reg) { if (reg) {
addr = of_translate_address(node, reg); addr = of_translate_address(node, reg);
if (addr != OF_BAD_ADDR) { if (addr != OF_BAD_ADDR) {
snprintf(name, BUS_ID_SIZE, dev_set_name(&dev->dev, "%llx.%s",
"%llx.%s", (unsigned long long)addr, (unsigned long long)addr, node->name);
node->name);
return; return;
} }
} }
@ -37,7 +35,7 @@ void of_device_make_bus_id(struct of_device *dev)
* counter (and pray...) * counter (and pray...)
*/ */
magic = atomic_add_return(1, &bus_no_reg_magic); 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); 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; dev->dev.archdata.of_node = np;
if (bus_id) if (bus_id)
strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); dev_set_name(&dev->dev, bus_id);
else else
of_device_make_bus_id(dev); of_device_make_bus_id(dev);

3
arch/microblaze/kernel/process.c
View File

@ -115,8 +115,7 @@ void flush_thread(void)
{ {
} }
/* FIXME - here will be a proposed change -> remove nr parameter */ int copy_thread(unsigned long clone_flags, unsigned long usp,
int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
unsigned long unused, unsigned long unused,
struct task_struct *p, struct pt_regs *regs) struct task_struct *p, struct pt_regs *regs)
{ {

1
arch/microblaze/kernel/prom.c
View File

@ -39,7 +39,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <linux/pci.h>
#include <asm/sections.h> #include <asm/sections.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>

1
arch/microblaze/kernel/ptrace.c
View File

@ -32,7 +32,6 @@
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/ptrace.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>

1
arch/microblaze/kernel/signal.c
View File

@ -37,7 +37,6 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <linux/signal.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/syscalls.h> #include <asm/syscalls.h>

2
arch/microblaze/kernel/sys_microblaze.c
View File

@ -29,9 +29,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/ipc.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/syscalls.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/unistd.h> #include <linux/unistd.h>