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

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc bugfixes from David Miller:

1) Missing include can lead to build failure, from Kirill Tkhai.

2) Use dev_is_pci() where applicable, from Yijing Wang.

3) Enable irqs after we enable preemption in cpu startup path, from
Kirill Tkhai.

4) Revert a __copy_{to,from}_user_inatomic change that broke
iov_iter_copy_from_user_atomic() and thus several tests in xfstests
and LTP. From Dave Kleikamp.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
Revert "sparc64: Fix __copy_{to,from}_user_inatomic defines."
sparc64: smp_callin: Enable irqs after preemption is disabled
sparc/PCI: Use dev_is_pci() to identify PCI devices
sparc64: Fix build regression

Linus Torvalds d11739e6 d6e0a2dd

+8 -7
+2 -2
arch/sparc/include/asm/uaccess_64.h
··· 262 262 extern __must_check long strlen_user(const char __user *str); 263 263 extern __must_check long strnlen_user(const char __user *str, long n); 264 264 265 - #define __copy_to_user_inatomic ___copy_to_user 266 - #define __copy_from_user_inatomic ___copy_from_user 265 + #define __copy_to_user_inatomic __copy_to_user 266 + #define __copy_from_user_inatomic __copy_from_user 267 267 268 268 struct pt_regs; 269 269 extern unsigned long compute_effective_address(struct pt_regs *,
+1 -1
arch/sparc/kernel/iommu.c
··· 854 854 return 1; 855 855 856 856 #ifdef CONFIG_PCI 857 - if (dev->bus == &pci_bus_type) 857 + if (dev_is_pci(dev)) 858 858 return pci64_dma_supported(to_pci_dev(dev), device_mask); 859 859 #endif 860 860
+2 -3
arch/sparc/kernel/ioport.c
··· 666 666 */ 667 667 int dma_supported(struct device *dev, u64 mask) 668 668 { 669 - #ifdef CONFIG_PCI 670 - if (dev->bus == &pci_bus_type) 669 + if (dev_is_pci(dev)) 671 670 return 1; 672 - #endif 671 + 673 672 return 0; 674 673 } 675 674 EXPORT_SYMBOL(dma_supported);
+1
arch/sparc/kernel/kgdb_64.c
··· 6 6 #include <linux/kgdb.h> 7 7 #include <linux/kdebug.h> 8 8 #include <linux/ftrace.h> 9 + #include <linux/context_tracking.h> 9 10 10 11 #include <asm/cacheflush.h> 11 12 #include <asm/kdebug.h>
+2 -1
arch/sparc/kernel/smp_64.c
··· 123 123 rmb(); 124 124 125 125 set_cpu_online(cpuid, true); 126 - local_irq_enable(); 127 126 128 127 /* idle thread is expected to have preempt disabled */ 129 128 preempt_disable(); 129 + 130 + local_irq_enable(); 130 131 131 132 cpu_startup_entry(CPUHP_ONLINE); 132 133 }