Commit 9f58c62f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze

Pull Microblaze updates from Michal Simek:
 - wire-up new bpf syscall
 - fix PCI bug
 - fix Kconfig warning

* tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Wire up bpf syscall
  microblaze: Fix IO space breakage after of_pci_range_to_resource() change
  microblaze: Fix missing NR_CPUS in menuconfig
parents 19e0d5f1 a4f174de
...@@ -129,6 +129,10 @@ endmenu ...@@ -129,6 +129,10 @@ endmenu
menu "Kernel features" menu "Kernel features"
config NR_CPUS
int
default "1"
config ADVANCED_OPTIONS config ADVANCED_OPTIONS
bool "Prompt for advanced kernel configuration options" bool "Prompt for advanced kernel configuration options"
help help
......
...@@ -38,6 +38,6 @@ ...@@ -38,6 +38,6 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define __NR_syscalls 387 #define __NR_syscalls 388
#endif /* _ASM_MICROBLAZE_UNISTD_H */ #endif /* _ASM_MICROBLAZE_UNISTD_H */
...@@ -402,5 +402,6 @@ ...@@ -402,5 +402,6 @@
#define __NR_seccomp 384 #define __NR_seccomp 384
#define __NR_getrandom 385 #define __NR_getrandom 385
#define __NR_memfd_create 386 #define __NR_memfd_create 386
#define __NR_bpf 387
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
...@@ -387,3 +387,4 @@ ENTRY(sys_call_table) ...@@ -387,3 +387,4 @@ ENTRY(sys_call_table)
.long sys_seccomp .long sys_seccomp
.long sys_getrandom /* 385 */ .long sys_getrandom /* 385 */
.long sys_memfd_create .long sys_memfd_create
.long sys_bpf
...@@ -660,8 +660,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose, ...@@ -660,8 +660,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
res = &hose->mem_resources[memno++]; res = &hose->mem_resources[memno++];
break; break;
} }
if (res != NULL) if (res != NULL) {
of_pci_range_to_resource(&range, dev, res); res->name = dev->full_name;
res->flags = range.flags;
res->start = range.cpu_addr;
res->end = range.cpu_addr + range.size - 1;
res->parent = res->child = res->sibling = NULL;
}
} }
/* If there's an ISA hole and the pci_mem_offset is -not- matching /* If there's an ISA hole and the pci_mem_offset is -not- matching
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment