Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
- Fix a build error on MSP71xx which used to rely on somehow magically
<asm/setup.h> being pulled in which no longer happens.
- Fix the __write_64bit_c0_split inline assembler where there was the
theoretical possibility of GCC interpret the constraints such that
bad code could result.
- A __init was causing section mismatch errors on Alchemy. Just to be
on the safe side, Manuel's patch does away with all of them.
- Fix perf event init.
* '4.14-fixes' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: PCI: fix pcibios_map_irq section mismatch
MIPS: Fix input modify in __write_64bit_c0_split()
MIPS: MSP71xx: Include asm/setup.h
MIPS: Fix perf event init
+37
-33
+9
-6
arch/mips/include/asm/mipsregs.h
+9
-6
arch/mips/include/asm/mipsregs.h
···
1377
1377
1378
1378
#define __write_64bit_c0_split(source, sel, val) \
1379
1379
do { \
1380
+
unsigned long long __tmp; \
1380
1381
unsigned long __flags; \
1381
1382
\
1382
1383
local_irq_save(__flags); \
1383
1384
if (sel == 0) \
1384
1385
__asm__ __volatile__( \
1385
1386
".set\tmips64\n\t" \
1386
-
"dsll\t%L0, %L0, 32\n\t" \
1387
+
"dsll\t%L0, %L1, 32\n\t" \
1387
1388
"dsrl\t%L0, %L0, 32\n\t" \
1388
-
"dsll\t%M0, %M0, 32\n\t" \
1389
+
"dsll\t%M0, %M1, 32\n\t" \
1389
1390
"or\t%L0, %L0, %M0\n\t" \
1390
1391
"dmtc0\t%L0, " #source "\n\t" \
1391
1392
".set\tmips0" \
1392
-
: : "r" (val)); \
1393
+
: "=&r,r" (__tmp) \
1394
+
: "r,0" (val)); \
1393
1395
else \
1394
1396
__asm__ __volatile__( \
1395
1397
".set\tmips64\n\t" \
1396
-
"dsll\t%L0, %L0, 32\n\t" \
1398
+
"dsll\t%L0, %L1, 32\n\t" \
1397
1399
"dsrl\t%L0, %L0, 32\n\t" \
1398
-
"dsll\t%M0, %M0, 32\n\t" \
1400
+
"dsll\t%M0, %M1, 32\n\t" \
1399
1401
"or\t%L0, %L0, %M0\n\t" \
1400
1402
"dmtc0\t%L0, " #source ", " #sel "\n\t" \
1401
1403
".set\tmips0" \
1402
-
: : "r" (val)); \
1404
+
: "=&r,r" (__tmp) \
1405
+
: "r,0" (val)); \
1403
1406
local_irq_restore(__flags); \
1404
1407
} while (0)
1405
1408
+1
-2
arch/mips/kernel/perf_event_mipsxx.c
+1
-2
arch/mips/kernel/perf_event_mipsxx.c
+1
-1
arch/mips/pci/fixup-capcella.c
+1
-1
arch/mips/pci/fixup-capcella.c
+1
-1
arch/mips/pci/fixup-cobalt.c
+1
-1
arch/mips/pci/fixup-cobalt.c
···
174
174
[COBALT_PCICONF_ETH1] = ETH1_IRQ
175
175
};
176
176
177
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
177
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
178
178
{
179
179
if (cobalt_board_id <= COBALT_BRD_ID_QUBE1)
180
180
return irq_tab_qube1[slot];
+1
-1
arch/mips/pci/fixup-emma2rh.c
+1
-1
arch/mips/pci/fixup-emma2rh.c
···
85
85
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH,
86
86
emma2rh_pci_host_fixup);
87
87
88
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
88
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
89
89
{
90
90
return irq_map[slot][pin];
91
91
}
+1
-1
arch/mips/pci/fixup-fuloong2e.c
+1
-1
arch/mips/pci/fixup-fuloong2e.c
+1
-1
arch/mips/pci/fixup-ip32.c
+1
-1
arch/mips/pci/fixup-ip32.c
···
39
39
* irqs. I suppose a device without a pin A will thank us for doing it
40
40
* right if there exists such a broken piece of crap.
41
41
*/
42
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
42
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
43
43
{
44
44
return irq_tab_mace[slot][pin];
45
45
}
+1
-1
arch/mips/pci/fixup-lantiq.c
+1
-1
arch/mips/pci/fixup-lantiq.c
+1
-1
arch/mips/pci/fixup-lemote2f.c
+1
-1
arch/mips/pci/fixup-lemote2f.c
+1
-1
arch/mips/pci/fixup-loongson3.c
+1
-1
arch/mips/pci/fixup-loongson3.c
+1
-1
arch/mips/pci/fixup-malta.c
+1
-1
arch/mips/pci/fixup-malta.c
+1
-1
arch/mips/pci/fixup-mpc30x.c
+1
-1
arch/mips/pci/fixup-mpc30x.c
+1
-1
arch/mips/pci/fixup-pmcmsp.c
+1
-1
arch/mips/pci/fixup-pmcmsp.c
···
202
202
* RETURNS: IRQ number
203
203
*
204
204
****************************************************************************/
205
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
205
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
206
206
{
207
207
#if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL)
208
208
printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n");
+1
-1
arch/mips/pci/fixup-sni.c
+1
-1
arch/mips/pci/fixup-sni.c
+1
-1
arch/mips/pci/fixup-tb0219.c
+1
-1
arch/mips/pci/fixup-tb0219.c
+1
-1
arch/mips/pci/fixup-tb0226.c
+1
-1
arch/mips/pci/fixup-tb0226.c
+1
-1
arch/mips/pci/fixup-tb0287.c
+1
-1
arch/mips/pci/fixup-tb0287.c
+1
-1
arch/mips/pci/pci-alchemy.c
+1
-1
arch/mips/pci/pci-alchemy.c
···
522
522
arch_initcall(alchemy_pci_init);
523
523
524
524
525
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
525
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
526
526
{
527
527
struct alchemy_pci_context *ctx = dev->sysdata;
528
528
if (ctx && ctx->board_map_irq)
+1
-1
arch/mips/pci/pci-bcm47xx.c
+1
-1
arch/mips/pci/pci-bcm47xx.c
+1
-1
arch/mips/pci/pci-lasat.c
+1
-1
arch/mips/pci/pci-lasat.c
+1
-1
arch/mips/pci/pci-mt7620.c
+1
-1
arch/mips/pci/pci-mt7620.c
+2
-2
arch/mips/pci/pci-octeon.c
+2
-2
arch/mips/pci/pci-octeon.c
···
59
59
} s;
60
60
};
61
61
62
-
int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
62
+
int (*octeon_pcibios_map_irq)(const struct pci_dev *dev,
63
63
u8 slot, u8 pin);
64
64
enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;
65
65
···
74
74
* as it goes through each bridge.
75
75
* Returns Interrupt number for the device
76
76
*/
77
-
int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
77
+
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
78
78
{
79
79
if (octeon_pcibios_map_irq)
80
80
return octeon_pcibios_map_irq(dev, slot, pin);
+1
-1
arch/mips/pci/pci-rt2880.c
+1
-1
arch/mips/pci/pci-rt2880.c
+1
-1
arch/mips/pci/pci-rt3883.c
+1
-1
arch/mips/pci/pci-rt3883.c
+1
-1
arch/mips/pci/pci-xlp.c
+1
-1
arch/mips/pci/pci-xlp.c
+1
-1
arch/mips/pci/pci-xlr.c
+1
-1
arch/mips/pci/pci-xlr.c
+2
arch/mips/pmcs-msp71xx/msp_smp.c
+2
arch/mips/pmcs-msp71xx/msp_smp.c