Skip to content

Commit de9ac5c

Browse files
torvaldstorvalds
committed
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
2 parents 7991b03 + d0e0454 commit de9ac5c

File tree

8 files changed

+90
-56
lines changed

8 files changed

+90
-56
lines changed

‎arch/microblaze/configs/mmu_defconfig

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
CONFIG_EXPERIMENTAL=y
22
CONFIG_SYSVIPC=y
3+
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_FHANDLE=y
5+
CONFIG_AUDIT=y
6+
CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
37
CONFIG_IKCONFIG=y
48
CONFIG_IKCONFIG_PROC=y
9+
CONFIG_SYSFS_DEPRECATED=y
510
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
1111
CONFIG_KALLSYMS_ALL=y
12-
CONFIG_KALLSYMS_EXTRA_PASS=y
13-
# CONFIG_HOTPLUG is not set
1412
# 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
1914
CONFIG_SLAB=y
2015
CONFIG_MODULES=y
2116
CONFIG_MODULE_UNLOAD=y
2217
# CONFIG_BLK_DEV_BSG is not set
18+
CONFIG_PARTITION_ADVANCED=y
19+
# CONFIG_EFI_PARTITION is not set
2320
CONFIG_OPT_LIB_ASM=y
2421
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
2522
CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
@@ -31,39 +28,62 @@ CONFIG_HZ_100=y
3128
CONFIG_MMU=y
3229
CONFIG_CMDLINE_BOOL=y
3330
CONFIG_CMDLINE_FORCE=y
31+
CONFIG_HIGHMEM=y
32+
CONFIG_PCI=y
33+
CONFIG_PCI_XILINX=y
3434
CONFIG_NET=y
3535
CONFIG_PACKET=y
3636
CONFIG_UNIX=y
3737
CONFIG_INET=y
3838
# CONFIG_INET_LRO is not set
3939
# CONFIG_IPV6 is not set
40+
CONFIG_MTD=y
4041
CONFIG_PROC_DEVICETREE=y
4142
CONFIG_BLK_DEV_RAM=y
4243
CONFIG_BLK_DEV_RAM_SIZE=8192
4344
CONFIG_NETDEVICES=y
44-
CONFIG_NET_ETHERNET=y
4545
CONFIG_XILINX_EMACLITE=y
46+
CONFIG_XILINX_LL_TEMAC=y
4647
# CONFIG_INPUT is not set
4748
# CONFIG_SERIO is not set
4849
# CONFIG_VT is not set
50+
CONFIG_SERIAL_8250=y
51+
CONFIG_SERIAL_8250_CONSOLE=y
4952
CONFIG_SERIAL_UARTLITE=y
5053
CONFIG_SERIAL_UARTLITE_CONSOLE=y
5154
# CONFIG_HW_RANDOM is not set
55+
CONFIG_XILINX_HWICAP=y
56+
CONFIG_I2C=y
57+
CONFIG_I2C_XILINX=y
58+
CONFIG_SPI=y
59+
CONFIG_SPI_XILINX=y
60+
CONFIG_GPIOLIB=y
61+
CONFIG_GPIO_SYSFS=y
62+
CONFIG_GPIO_XILINX=y
5263
# CONFIG_HWMON is not set
64+
CONFIG_WATCHDOG=y
65+
CONFIG_XILINX_WATCHDOG=y
66+
CONFIG_FB=y
67+
CONFIG_FB_XILINX=y
5368
# CONFIG_USB_SUPPORT is not set
69+
CONFIG_UIO=y
70+
CONFIG_UIO_PDRV=y
71+
CONFIG_UIO_PDRV_GENIRQ=y
72+
CONFIG_UIO_DMEM_GENIRQ=y
5473
CONFIG_EXT2_FS=y
5574
# CONFIG_DNOTIFY is not set
75+
CONFIG_CRAMFS=y
76+
CONFIG_ROMFS_FS=y
5677
CONFIG_NFS_FS=y
57-
CONFIG_NFS_V3=y
5878
CONFIG_CIFS=y
5979
CONFIG_CIFS_STATS=y
6080
CONFIG_CIFS_STATS2=y
61-
CONFIG_PARTITION_ADVANCED=y
62-
CONFIG_DEBUG_KERNEL=y
6381
CONFIG_DETECT_HUNG_TASK=y
6482
CONFIG_DEBUG_SLAB=y
6583
CONFIG_DEBUG_SPINLOCK=y
6684
CONFIG_DEBUG_INFO=y
67-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
6885
CONFIG_EARLY_PRINTK=y
86+
CONFIG_KEYS=y
87+
CONFIG_ENCRYPTED_KEYS=y
88+
CONFIG_KEYS_DEBUG_PROC_KEYS=y
6989
# CONFIG_CRYPTO_ANSI_CPRNG is not set

‎arch/microblaze/configs/nommu_defconfig

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,42 @@
11
CONFIG_EXPERIMENTAL=y
22
CONFIG_SYSVIPC=y
33
CONFIG_POSIX_MQUEUE=y
4+
CONFIG_FHANDLE=y
5+
CONFIG_AUDIT=y
6+
CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
47
CONFIG_BSD_PROCESS_ACCT=y
58
CONFIG_BSD_PROCESS_ACCT_V3=y
69
CONFIG_IKCONFIG=y
710
CONFIG_IKCONFIG_PROC=y
11+
CONFIG_SYSFS_DEPRECATED=y
812
CONFIG_SYSFS_DEPRECATED_V2=y
9-
CONFIG_EXPERT=y
1013
CONFIG_KALLSYMS_ALL=y
11-
CONFIG_KALLSYMS_EXTRA_PASS=y
12-
# CONFIG_HOTPLUG is not set
1314
# CONFIG_BASE_FULL is not set
15+
CONFIG_EMBEDDED=y
1416
CONFIG_SLAB=y
1517
CONFIG_MODULES=y
1618
CONFIG_MODULE_UNLOAD=y
1719
# 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
1922
CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
2023
CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
2124
CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
2225
CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
2326
CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
2427
CONFIG_XILINX_MICROBLAZE0_USE_FPU=2
25-
CONFIG_HIGH_RES_TIMERS=y
2628
CONFIG_HZ_100=y
2729
CONFIG_CMDLINE_BOOL=y
28-
CONFIG_BINFMT_FLAT=y
30+
CONFIG_CMDLINE_FORCE=y
31+
CONFIG_PCI=y
32+
CONFIG_PCI_XILINX=y
2933
CONFIG_NET=y
3034
CONFIG_PACKET=y
3135
CONFIG_UNIX=y
3236
CONFIG_INET=y
3337
# CONFIG_INET_LRO is not set
3438
# CONFIG_IPV6 is not set
35-
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
3639
CONFIG_MTD=y
37-
CONFIG_MTD_CONCAT=y
38-
CONFIG_MTD_PARTITIONS=y
3940
CONFIG_MTD_CMDLINE_PARTS=y
4041
CONFIG_MTD_CHAR=y
4142
CONFIG_MTD_BLOCK=y
@@ -45,41 +46,55 @@ CONFIG_MTD_CFI_AMDSTD=y
4546
CONFIG_MTD_RAM=y
4647
CONFIG_MTD_UCLINUX=y
4748
CONFIG_PROC_DEVICETREE=y
48-
CONFIG_BLK_DEV_NBD=y
4949
CONFIG_BLK_DEV_RAM=y
50+
CONFIG_BLK_DEV_RAM_SIZE=8192
5051
CONFIG_NETDEVICES=y
51-
CONFIG_NET_ETHERNET=y
52+
CONFIG_XILINX_EMACLITE=y
53+
CONFIG_XILINX_LL_TEMAC=y
5254
# CONFIG_INPUT is not set
5355
# CONFIG_SERIO is not set
5456
# CONFIG_VT is not set
57+
CONFIG_SERIAL_8250=y
58+
CONFIG_SERIAL_8250_CONSOLE=y
5559
CONFIG_SERIAL_UARTLITE=y
5660
CONFIG_SERIAL_UARTLITE_CONSOLE=y
57-
CONFIG_HW_RANDOM=y
61+
# CONFIG_HW_RANDOM is not set
62+
CONFIG_XILINX_HWICAP=y
63+
CONFIG_I2C=y
64+
CONFIG_I2C_XILINX=y
65+
CONFIG_SPI=y
66+
CONFIG_SPI_XILINX=y
67+
CONFIG_GPIOLIB=y
68+
CONFIG_GPIO_SYSFS=y
69+
CONFIG_GPIO_XILINX=y
5870
# CONFIG_HWMON is not set
59-
CONFIG_VIDEO_OUTPUT_CONTROL=y
71+
CONFIG_WATCHDOG=y
72+
CONFIG_XILINX_WATCHDOG=y
73+
CONFIG_FB=y
74+
CONFIG_FB_XILINX=y
75+
# CONFIG_USB_SUPPORT is not set
76+
CONFIG_UIO=y
77+
CONFIG_UIO_PDRV=y
78+
CONFIG_UIO_PDRV_GENIRQ=y
79+
CONFIG_UIO_DMEM_GENIRQ=y
6080
CONFIG_EXT2_FS=y
6181
# CONFIG_DNOTIFY is not set
6282
CONFIG_CRAMFS=y
6383
CONFIG_ROMFS_FS=y
6484
CONFIG_NFS_FS=y
65-
CONFIG_NFS_V3=y
6685
CONFIG_NFS_V3_ACL=y
67-
CONFIG_UNUSED_SYMBOLS=y
68-
CONFIG_DEBUG_FS=y
69-
CONFIG_DEBUG_KERNEL=y
70-
CONFIG_DEBUG_SHIRQ=y
86+
CONFIG_NLS=y
7187
CONFIG_DETECT_HUNG_TASK=y
72-
CONFIG_SCHEDSTATS=y
73-
CONFIG_TIMER_STATS=y
74-
CONFIG_DEBUG_OBJECTS=y
75-
CONFIG_DEBUG_OBJECTS_SELFTEST=y
76-
CONFIG_DEBUG_OBJECTS_FREE=y
77-
CONFIG_DEBUG_OBJECTS_TIMERS=y
88+
CONFIG_DEBUG_SLAB=y
89+
CONFIG_DEBUG_SPINLOCK=y
7890
CONFIG_DEBUG_INFO=y
79-
CONFIG_DEBUG_LIST=y
80-
CONFIG_DEBUG_SG=y
81-
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
82-
CONFIG_SYSCTL_SYSCALL_CHECK=y
8391
CONFIG_EARLY_PRINTK=y
92+
CONFIG_KEYS=y
93+
CONFIG_ENCRYPTED_KEYS=y
94+
CONFIG_KEYS_DEBUG_PROC_KEYS=y
95+
CONFIG_CRYPTO_ECB=y
96+
CONFIG_CRYPTO_MD4=y
97+
CONFIG_CRYPTO_MD5=y
98+
CONFIG_CRYPTO_ARC4=y
99+
CONFIG_CRYPTO_DES=y
84100
# CONFIG_CRYPTO_ANSI_CPRNG is not set
85-
# CONFIG_CRC32 is not set

‎arch/microblaze/include/asm/highmem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static inline void kunmap(struct page *page)
7171
kunmap_high(page);
7272
}
7373

74-
static inline void *__kmap_atomic(struct page *page)
74+
static inline void *kmap_atomic(struct page *page)
7575
{
7676
return kmap_atomic_prot(page, kmap_prot);
7777
}

‎arch/microblaze/include/asm/uaccess.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static inline int ___range_ok(unsigned long addr, unsigned long size)
108108
# define __EX_TABLE_SECTION ".section __ex_table,\"a\"\n"
109109
#else
110110
# 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"
112112
#endif
113113

114114
extern unsigned long __copy_tofrom_user(void __user *to,

‎arch/microblaze/include/asm/unistd.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
3838
#define __ARCH_WANT_SYS_CLONE
3939
#define __ARCH_WANT_SYS_VFORK
40-
#ifdef CONFIG_MMU
4140
#define __ARCH_WANT_SYS_FORK
42-
#endif
4341

4442
/*
4543
* "Conditional" syscalls

‎arch/microblaze/include/uapi/asm/unistd.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@
395395
#define __NR_process_vm_readv 377
396396
#define __NR_process_vm_writev 378
397397
#define __NR_kcmp 379
398+
#define __NR_finit_module 380
398399

399-
#define __NR_syscalls 380
400+
#define __NR_syscalls 381
400401

401402
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

‎arch/microblaze/kernel/syscall_table.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,3 +380,4 @@ ENTRY(sys_call_table)
380380
.long sys_process_vm_readv
381381
.long sys_process_vm_writev
382382
.long sys_kcmp
383+
.long sys_finit_module

‎arch/microblaze/pci/pci-common.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
287287
unsigned long io_offset = 0;
288288
int i, res_bit;
289289

290-
if (hose == 0)
290+
if (!hose)
291291
return NULL; /* should never happen */
292292

293293
/* If memory, add on the PCI bridge address offset */
@@ -821,8 +821,6 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
821821
/* Decide whether to display the domain number in /proc */
822822
int pci_proc_domain(struct pci_bus *bus)
823823
{
824-
struct pci_controller *hose = pci_bus_to_host(bus);
825-
826824
return 0;
827825
}
828826

@@ -1123,7 +1121,7 @@ static int __init reparent_resources(struct resource *parent,
11231121
* as well.
11241122
*/
11251123

1126-
void pcibios_allocate_bus_resources(struct pci_bus *bus)
1124+
static void pcibios_allocate_bus_resources(struct pci_bus *bus)
11271125
{
11281126
struct pci_bus *b;
11291127
int i;
@@ -1178,7 +1176,7 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus)
11781176
}
11791177
printk(KERN_WARNING "PCI: Cannot allocate resource region "
11801178
"%d of PCI bridge %d, will remap\n", i, bus->number);
1181-
clear_resource:
1179+
11821180
res->start = res->end = 0;
11831181
res->flags = 0;
11841182
}
@@ -1433,7 +1431,8 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,
14331431
res->end = res->start + IO_SPACE_LIMIT;
14341432
res->flags = IORESOURCE_IO;
14351433
}
1436-
pci_add_resource_offset(resources, res, hose->io_base_virt - _IO_BASE);
1434+
pci_add_resource_offset(resources, res,
1435+
(__force resource_size_t)(hose->io_base_virt - _IO_BASE));
14371436

14381437
pr_debug("PCI: PHB IO resource = %016llx-%016llx [%lx]\n",
14391438
(unsigned long long)res->start,

0 commit comments

Comments
 (0)