Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"This fixes noMMU kernel and I have also added defconfig updates which
fix issue with one external dependency and enable all xilinx device
drivers for 0-day testing system.
Additionally wire up finit_module system call, and do highmem fixup
and pci warnings reported by the 0-day testing system"
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Update microblaze defconfigs
microblaze: Fix pci compilation and sparse warnings
microblaze: Add finit_module syscall
microblaze: Kill __kmap_atomic()
microblaze: Change section flags for noMMU
microblaze: Microblaze wants sys_fork for noMMU too
+90
-56
+36
-16
arch/microblaze/configs/mmu_defconfig
+36
-16
arch/microblaze/configs/mmu_defconfig
···
1
1
CONFIG_EXPERIMENTAL=y
2
2
CONFIG_SYSVIPC=y
3
+
CONFIG_POSIX_MQUEUE=y
4
+
CONFIG_FHANDLE=y
5
+
CONFIG_AUDIT=y
6
+
CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
3
7
CONFIG_IKCONFIG=y
4
8
CONFIG_IKCONFIG_PROC=y
9
+
CONFIG_SYSFS_DEPRECATED=y
5
10
CONFIG_SYSFS_DEPRECATED_V2=y
6
-
CONFIG_BLK_DEV_INITRD=y
7
-
CONFIG_INITRAMFS_SOURCE="rootfs.cpio"
8
-
CONFIG_INITRAMFS_COMPRESSION_GZIP=y
9
-
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
10
-
CONFIG_EXPERT=y
11
11
CONFIG_KALLSYMS_ALL=y
12
-
CONFIG_KALLSYMS_EXTRA_PASS=y
13
-
# CONFIG_HOTPLUG is not set
14
12
# CONFIG_BASE_FULL is not set
15
-
# CONFIG_FUTEX is not set
16
-
# CONFIG_EPOLL is not set
17
-
# CONFIG_SIGNALFD is not set
18
-
# CONFIG_SHMEM is not set
13
+
CONFIG_EMBEDDED=y
19
14
CONFIG_SLAB=y
20
15
CONFIG_MODULES=y
21
16
CONFIG_MODULE_UNLOAD=y
22
17
# CONFIG_BLK_DEV_BSG is not set
18
+
CONFIG_PARTITION_ADVANCED=y
19
+
# CONFIG_EFI_PARTITION is not set
23
20
CONFIG_OPT_LIB_ASM=y
24
21
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
25
22
CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
···
28
31
CONFIG_MMU=y
29
32
CONFIG_CMDLINE_BOOL=y
30
33
CONFIG_CMDLINE_FORCE=y
34
+
CONFIG_HIGHMEM=y
35
+
CONFIG_PCI=y
36
+
CONFIG_PCI_XILINX=y
31
37
CONFIG_NET=y
32
38
CONFIG_PACKET=y
33
39
CONFIG_UNIX=y
34
40
CONFIG_INET=y
35
41
# CONFIG_INET_LRO is not set
36
42
# CONFIG_IPV6 is not set
43
+
CONFIG_MTD=y
37
44
CONFIG_PROC_DEVICETREE=y
38
45
CONFIG_BLK_DEV_RAM=y
39
46
CONFIG_BLK_DEV_RAM_SIZE=8192
40
47
CONFIG_NETDEVICES=y
41
-
CONFIG_NET_ETHERNET=y
42
48
CONFIG_XILINX_EMACLITE=y
49
+
CONFIG_XILINX_LL_TEMAC=y
43
50
# CONFIG_INPUT is not set
44
51
# CONFIG_SERIO is not set
45
52
# CONFIG_VT is not set
53
+
CONFIG_SERIAL_8250=y
54
+
CONFIG_SERIAL_8250_CONSOLE=y
46
55
CONFIG_SERIAL_UARTLITE=y
47
56
CONFIG_SERIAL_UARTLITE_CONSOLE=y
48
57
# CONFIG_HW_RANDOM is not set
58
+
CONFIG_XILINX_HWICAP=y
59
+
CONFIG_I2C=y
60
+
CONFIG_I2C_XILINX=y
61
+
CONFIG_SPI=y
62
+
CONFIG_SPI_XILINX=y
63
+
CONFIG_GPIOLIB=y
64
+
CONFIG_GPIO_SYSFS=y
65
+
CONFIG_GPIO_XILINX=y
49
66
# CONFIG_HWMON is not set
67
+
CONFIG_WATCHDOG=y
68
+
CONFIG_XILINX_WATCHDOG=y
69
+
CONFIG_FB=y
70
+
CONFIG_FB_XILINX=y
50
71
# CONFIG_USB_SUPPORT is not set
72
+
CONFIG_UIO=y
73
+
CONFIG_UIO_PDRV=y
74
+
CONFIG_UIO_PDRV_GENIRQ=y
75
+
CONFIG_UIO_DMEM_GENIRQ=y
51
76
CONFIG_EXT2_FS=y
52
77
# CONFIG_DNOTIFY is not set
78
+
CONFIG_CRAMFS=y
79
+
CONFIG_ROMFS_FS=y
53
80
CONFIG_NFS_FS=y
54
-
CONFIG_NFS_V3=y
55
81
CONFIG_CIFS=y
56
82
CONFIG_CIFS_STATS=y
57
83
CONFIG_CIFS_STATS2=y
58
-
CONFIG_PARTITION_ADVANCED=y
59
-
CONFIG_DEBUG_KERNEL=y
60
84
CONFIG_DETECT_HUNG_TASK=y
61
85
CONFIG_DEBUG_SLAB=y
62
86
CONFIG_DEBUG_SPINLOCK=y
63
87
CONFIG_DEBUG_INFO=y
64
-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
65
88
CONFIG_EARLY_PRINTK=y
89
+
CONFIG_KEYS=y
90
+
CONFIG_ENCRYPTED_KEYS=y
91
+
CONFIG_KEYS_DEBUG_PROC_KEYS=y
66
92
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+44
-29
arch/microblaze/configs/nommu_defconfig
+44
-29
arch/microblaze/configs/nommu_defconfig
···
1
1
CONFIG_EXPERIMENTAL=y
2
2
CONFIG_SYSVIPC=y
3
3
CONFIG_POSIX_MQUEUE=y
4
+
CONFIG_FHANDLE=y
5
+
CONFIG_AUDIT=y
6
+
CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
4
7
CONFIG_BSD_PROCESS_ACCT=y
5
8
CONFIG_BSD_PROCESS_ACCT_V3=y
6
9
CONFIG_IKCONFIG=y
7
10
CONFIG_IKCONFIG_PROC=y
11
+
CONFIG_SYSFS_DEPRECATED=y
8
12
CONFIG_SYSFS_DEPRECATED_V2=y
9
-
CONFIG_EXPERT=y
10
13
CONFIG_KALLSYMS_ALL=y
11
-
CONFIG_KALLSYMS_EXTRA_PASS=y
12
-
# CONFIG_HOTPLUG is not set
13
14
# CONFIG_BASE_FULL is not set
15
+
CONFIG_EMBEDDED=y
14
16
CONFIG_SLAB=y
15
17
CONFIG_MODULES=y
16
18
CONFIG_MODULE_UNLOAD=y
17
19
# CONFIG_BLK_DEV_BSG is not set
18
-
# CONFIG_OPT_LIB_FUNCTION is not set
20
+
CONFIG_PARTITION_ADVANCED=y
21
+
# CONFIG_EFI_PARTITION is not set
19
22
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
20
23
CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
21
24
CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
22
25
CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
23
26
CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
24
27
CONFIG_XILINX_MICROBLAZE0_USE_FPU=2
25
-
CONFIG_HIGH_RES_TIMERS=y
26
28
CONFIG_HZ_100=y
27
29
CONFIG_CMDLINE_BOOL=y
28
-
CONFIG_BINFMT_FLAT=y
30
+
CONFIG_CMDLINE_FORCE=y
31
+
CONFIG_PCI=y
32
+
CONFIG_PCI_XILINX=y
29
33
CONFIG_NET=y
30
34
CONFIG_PACKET=y
31
35
CONFIG_UNIX=y
32
36
CONFIG_INET=y
33
37
# CONFIG_INET_LRO is not set
34
38
# CONFIG_IPV6 is not set
35
-
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
36
39
CONFIG_MTD=y
37
-
CONFIG_MTD_CONCAT=y
38
-
CONFIG_MTD_PARTITIONS=y
39
40
CONFIG_MTD_CMDLINE_PARTS=y
40
41
CONFIG_MTD_CHAR=y
41
42
CONFIG_MTD_BLOCK=y
···
46
45
CONFIG_MTD_RAM=y
47
46
CONFIG_MTD_UCLINUX=y
48
47
CONFIG_PROC_DEVICETREE=y
49
-
CONFIG_BLK_DEV_NBD=y
50
48
CONFIG_BLK_DEV_RAM=y
49
+
CONFIG_BLK_DEV_RAM_SIZE=8192
51
50
CONFIG_NETDEVICES=y
52
-
CONFIG_NET_ETHERNET=y
51
+
CONFIG_XILINX_EMACLITE=y
52
+
CONFIG_XILINX_LL_TEMAC=y
53
53
# CONFIG_INPUT is not set
54
54
# CONFIG_SERIO is not set
55
55
# CONFIG_VT is not set
56
+
CONFIG_SERIAL_8250=y
57
+
CONFIG_SERIAL_8250_CONSOLE=y
56
58
CONFIG_SERIAL_UARTLITE=y
57
59
CONFIG_SERIAL_UARTLITE_CONSOLE=y
58
-
CONFIG_HW_RANDOM=y
60
+
# CONFIG_HW_RANDOM is not set
61
+
CONFIG_XILINX_HWICAP=y
62
+
CONFIG_I2C=y
63
+
CONFIG_I2C_XILINX=y
64
+
CONFIG_SPI=y
65
+
CONFIG_SPI_XILINX=y
66
+
CONFIG_GPIOLIB=y
67
+
CONFIG_GPIO_SYSFS=y
68
+
CONFIG_GPIO_XILINX=y
59
69
# CONFIG_HWMON is not set
60
-
CONFIG_VIDEO_OUTPUT_CONTROL=y
70
+
CONFIG_WATCHDOG=y
71
+
CONFIG_XILINX_WATCHDOG=y
72
+
CONFIG_FB=y
73
+
CONFIG_FB_XILINX=y
74
+
# CONFIG_USB_SUPPORT is not set
75
+
CONFIG_UIO=y
76
+
CONFIG_UIO_PDRV=y
77
+
CONFIG_UIO_PDRV_GENIRQ=y
78
+
CONFIG_UIO_DMEM_GENIRQ=y
61
79
CONFIG_EXT2_FS=y
62
80
# CONFIG_DNOTIFY is not set
63
81
CONFIG_CRAMFS=y
64
82
CONFIG_ROMFS_FS=y
65
83
CONFIG_NFS_FS=y
66
-
CONFIG_NFS_V3=y
67
84
CONFIG_NFS_V3_ACL=y
68
-
CONFIG_UNUSED_SYMBOLS=y
69
-
CONFIG_DEBUG_FS=y
70
-
CONFIG_DEBUG_KERNEL=y
71
-
CONFIG_DEBUG_SHIRQ=y
85
+
CONFIG_NLS=y
72
86
CONFIG_DETECT_HUNG_TASK=y
73
-
CONFIG_SCHEDSTATS=y
74
-
CONFIG_TIMER_STATS=y
75
-
CONFIG_DEBUG_OBJECTS=y
76
-
CONFIG_DEBUG_OBJECTS_SELFTEST=y
77
-
CONFIG_DEBUG_OBJECTS_FREE=y
78
-
CONFIG_DEBUG_OBJECTS_TIMERS=y
87
+
CONFIG_DEBUG_SLAB=y
88
+
CONFIG_DEBUG_SPINLOCK=y
79
89
CONFIG_DEBUG_INFO=y
80
-
CONFIG_DEBUG_LIST=y
81
-
CONFIG_DEBUG_SG=y
82
-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
83
-
CONFIG_SYSCTL_SYSCALL_CHECK=y
84
90
CONFIG_EARLY_PRINTK=y
91
+
CONFIG_KEYS=y
92
+
CONFIG_ENCRYPTED_KEYS=y
93
+
CONFIG_KEYS_DEBUG_PROC_KEYS=y
94
+
CONFIG_CRYPTO_ECB=y
95
+
CONFIG_CRYPTO_MD4=y
96
+
CONFIG_CRYPTO_MD5=y
97
+
CONFIG_CRYPTO_ARC4=y
98
+
CONFIG_CRYPTO_DES=y
85
99
# CONFIG_CRYPTO_ANSI_CPRNG is not set
86
-
# CONFIG_CRC32 is not set
+1
-1
arch/microblaze/include/asm/highmem.h
+1
-1
arch/microblaze/include/asm/highmem.h
+1
-1
arch/microblaze/include/asm/uaccess.h
+1
-1
arch/microblaze/include/asm/uaccess.h
···
108
108
# define __EX_TABLE_SECTION ".section __ex_table,\"a\"\n"
109
109
#else
110
110
# define __FIXUP_SECTION ".section .discard,\"ax\"\n"
111
-
# define __EX_TABLE_SECTION ".section .discard,\"a\"\n"
111
+
# define __EX_TABLE_SECTION ".section .discard,\"ax\"\n"
112
112
#endif
113
113
114
114
extern unsigned long __copy_tofrom_user(void __user *to,
-2
arch/microblaze/include/asm/unistd.h
-2
arch/microblaze/include/asm/unistd.h
+2
-1
arch/microblaze/include/uapi/asm/unistd.h
+2
-1
arch/microblaze/include/uapi/asm/unistd.h
+1
arch/microblaze/kernel/syscall_table.S
+1
arch/microblaze/kernel/syscall_table.S
+5
-6
arch/microblaze/pci/pci-common.c
+5
-6
arch/microblaze/pci/pci-common.c
···
287
287
unsigned long io_offset = 0;
288
288
int i, res_bit;
289
289
290
-
if (hose == 0)
290
+
if (!hose)
291
291
return NULL; /* should never happen */
292
292
293
293
/* If memory, add on the PCI bridge address offset */
···
821
821
/* Decide whether to display the domain number in /proc */
822
822
int pci_proc_domain(struct pci_bus *bus)
823
823
{
824
-
struct pci_controller *hose = pci_bus_to_host(bus);
825
-
826
824
return 0;
827
825
}
828
826
···
1121
1123
* as well.
1122
1124
*/
1123
1125
1124
-
void pcibios_allocate_bus_resources(struct pci_bus *bus)
1126
+
static void pcibios_allocate_bus_resources(struct pci_bus *bus)
1125
1127
{
1126
1128
struct pci_bus *b;
1127
1129
int i;
···
1176
1178
}
1177
1179
printk(KERN_WARNING "PCI: Cannot allocate resource region "
1178
1180
"%d of PCI bridge %d, will remap\n", i, bus->number);
1179
-
clear_resource:
1181
+
1180
1182
res->start = res->end = 0;
1181
1183
res->flags = 0;
1182
1184
}
···
1431
1433
res->end = res->start + IO_SPACE_LIMIT;
1432
1434
res->flags = IORESOURCE_IO;
1433
1435
}
1434
-
pci_add_resource_offset(resources, res, hose->io_base_virt - _IO_BASE);
1436
+
pci_add_resource_offset(resources, res,
1437
+
(__force resource_size_t)(hose->io_base_virt - _IO_BASE));
1435
1438
1436
1439
pr_debug("PCI: PHB IO resource = %016llx-%016llx [%lx]\n",
1437
1440
(unsigned long long)res->start,