tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* '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

Linus Torvalds 2b6b6d38 3e862dd5

+15 -14
unified split
+1
MAINTAINERS
··· 3680 3680 W: http://www.monstr.eu/fdt/ 3681 3681 T: git git://git.monstr.eu/linux-2.6-microblaze.git 3682 3682 S: Supported 3683 + F: arch/microblaze/ 3683 3684 3684 3685 MICROTEK X6 SCANNER 3685 3686 P: Oliver Neukum
+1
arch/microblaze/include/asm/auxvec.h
··· 1 +
+1
arch/microblaze/include/asm/cputable.h
··· 1 +
+1
arch/microblaze/include/asm/ftrace.h
··· 1 +
+1
arch/microblaze/include/asm/hw_irq.h
··· 1 +
-1
arch/microblaze/include/asm/io.h
··· 12 12 #include <asm/byteorder.h> 13 13 #include <asm/page.h> 14 14 #include <linux/types.h> 15 - #include <asm/page.h> 16 15 17 16 #define IO_SPACE_LIMIT (0xFFFFFFFF) 18 17
+3
arch/microblaze/include/asm/socket.h
··· 63 63 64 64 #define SO_MARK 36 65 65 66 + #define SO_TIMESTAMPING 37 67 + #define SCM_TIMESTAMPING SO_TIMESTAMPING 68 + 66 69 #endif /* _ASM_MICROBLAZE_SOCKET_H */
+1
arch/microblaze/include/asm/user.h
··· 1 +
+1
arch/microblaze/include/asm/vga.h
··· 1 +
+4 -6
arch/microblaze/kernel/of_device.c
··· 13 13 { 14 14 static atomic_t bus_no_reg_magic; 15 15 struct device_node *node = dev->node; 16 - char *name = dev->dev.bus_id; 17 16 const u32 *reg; 18 17 u64 addr; 19 18 int magic; ··· 24 25 if (reg) { 25 26 addr = of_translate_address(node, reg); 26 27 if (addr != OF_BAD_ADDR) { 27 - snprintf(name, BUS_ID_SIZE, 28 - "%llx.%s", (unsigned long long)addr, 29 - node->name); 28 + dev_set_name(&dev->dev, "%llx.%s", 29 + (unsigned long long)addr, node->name); 30 30 return; 31 31 } 32 32 } ··· 35 37 * counter (and pray...) 36 38 */ 37 39 magic = atomic_add_return(1, &bus_no_reg_magic); 38 - snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1); 40 + dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1); 39 41 } 40 42 EXPORT_SYMBOL(of_device_make_bus_id); 41 43 ··· 56 58 dev->dev.archdata.of_node = np; 57 59 58 60 if (bus_id) 59 - strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); 61 + dev_set_name(&dev->dev, bus_id); 60 62 else 61 63 of_device_make_bus_id(dev); 62 64
+1 -2
arch/microblaze/kernel/process.c
··· 115 115 { 116 116 } 117 117 118 - /* FIXME - here will be a proposed change -> remove nr parameter */ 119 - int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 118 + int copy_thread(unsigned long clone_flags, unsigned long usp, 120 119 unsigned long unused, 121 120 struct task_struct *p, struct pt_regs *regs) 122 121 {
-1
arch/microblaze/kernel/prom.c
··· 39 39 #include <asm/system.h> 40 40 #include <asm/mmu.h> 41 41 #include <asm/pgtable.h> 42 - #include <linux/pci.h> 43 42 #include <asm/sections.h> 44 43 #include <asm/pci-bridge.h> 45 44
-1
arch/microblaze/kernel/ptrace.c
··· 32 32 #include <linux/signal.h> 33 33 34 34 #include <linux/errno.h> 35 - #include <linux/ptrace.h> 36 35 #include <asm/processor.h> 37 36 #include <linux/uaccess.h> 38 37 #include <asm/asm-offsets.h>
-1
arch/microblaze/kernel/signal.c
··· 37 37 #include <linux/uaccess.h> 38 38 #include <asm/pgtable.h> 39 39 #include <asm/pgalloc.h> 40 - #include <linux/signal.h> 41 40 #include <linux/syscalls.h> 42 41 #include <asm/cacheflush.h> 43 42 #include <asm/syscalls.h>
-2
arch/microblaze/kernel/sys_microblaze.c
··· 29 29 #include <linux/module.h> 30 30 #include <linux/err.h> 31 31 #include <linux/fs.h> 32 - #include <linux/ipc.h> 33 32 #include <linux/semaphore.h> 34 - #include <linux/syscalls.h> 35 33 #include <linux/uaccess.h> 36 34 #include <linux/unistd.h> 37 35