Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9f58c62fcc66f06aee141fdd80d15213b7f4809a

Authored by Linus Torvalds
2 parents 19e0d5f16a a4f174dee4
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 5 changed files Side-by-side Diff

arch/microblaze/Kconfig
Diff comments   View file @ 9f58c62
... ... @@ -129,6 +129,10 @@
129 129  
130 130 menu "Kernel features"
131 131  
  132 +config NR_CPUS
  133 + int
  134 + default "1"
  135 +
132 136 config ADVANCED_OPTIONS
133 137 bool "Prompt for advanced kernel configuration options"
134 138 help
arch/microblaze/include/asm/unistd.h
Diff comments   View file @ 9f58c62
... ... @@ -38,7 +38,7 @@
38 38  
39 39 #endif /* __ASSEMBLY__ */
40 40  
41   -#define __NR_syscalls 387
  41 +#define __NR_syscalls 388
42 42  
43 43 #endif /* _ASM_MICROBLAZE_UNISTD_H */
arch/microblaze/include/uapi/asm/unistd.h
Diff comments   View file @ 9f58c62
... ... @@ -402,6 +402,7 @@
402 402 #define __NR_seccomp 384
403 403 #define __NR_getrandom 385
404 404 #define __NR_memfd_create 386
  405 +#define __NR_bpf 387
405 406  
406 407 #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
arch/microblaze/kernel/syscall_table.S
Diff comments   View file @ 9f58c62
... ... @@ -387,4 +387,5 @@
387 387 .long sys_seccomp
388 388 .long sys_getrandom /* 385 */
389 389 .long sys_memfd_create
  390 + .long sys_bpf
arch/microblaze/pci/pci-common.c
Diff comments   View file @ 9f58c62
... ... @@ -660,8 +660,13 @@
660 660 res = &hose->mem_resources[memno++];
661 661 break;
662 662 }
663   - if (res != NULL)
664   - of_pci_range_to_resource(&range, dev, res);
  663 + if (res != NULL) {
  664 + res->name = dev->full_name;
  665 + res->flags = range.flags;
  666 + res->start = range.cpu_addr;
  667 + res->end = range.cpu_addr + range.size - 1;
  668 + res->parent = res->child = res->sibling = NULL;
  669 + }
665 670 }
666 671  
667 672 /* If there's an ISA hole and the pci_mem_offset is -not- matching