Skip to content

Commit 6470812

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Just a couple small fixes, two of which have to do with gcc-7: 1) Don't clobber kernel fixed registers in __multi4 libgcc helper. 2) Fix a new uninitialized variable warning on sparc32 with gcc-7, from Thomas Petazzoni. 3) Adjust pmd_t initializer on sparc32 to make gcc happy. 4) If ATU isn't available, don't bark in the logs. From Tushar Dave" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: kernel/pcic: silence gcc 7.x warning in pcibios_fixup_bus() sparc64: remove unnecessary log message sparc64: Don't clibber fixed registers in __multi4. mm: add pmd_t initializer __pmd() to work around a GCC bug.
2 parents 05ab303 + 2dc7753 commit 6470812

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

arch/sparc/include/asm/page_32.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ typedef struct { unsigned long iopgprot; } iopgprot_t;
6868
#define iopgprot_val(x) ((x).iopgprot)
6969

7070
#define __pte(x) ((pte_t) { (x) } )
71+
#define __pmd(x) ((pmd_t) { { (x) }, })
7172
#define __iopte(x) ((iopte_t) { (x) } )
7273
#define __pgd(x) ((pgd_t) { (x) } )
7374
#define __ctxd(x) ((ctxd_t) { (x) } )
@@ -95,6 +96,7 @@ typedef unsigned long iopgprot_t;
9596
#define iopgprot_val(x) (x)
9697

9798
#define __pte(x) (x)
99+
#define __pmd(x) ((pmd_t) { { (x) }, })
98100
#define __iopte(x) (x)
99101
#define __pgd(x) (x)
100102
#define __ctxd(x) (x)

arch/sparc/kernel/pci_sun4v.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,8 +1266,6 @@ static int pci_sun4v_probe(struct platform_device *op)
12661266
* ATU group, but ATU hcalls won't be available.
12671267
*/
12681268
hv_atu = false;
1269-
pr_err(PFX "Could not register hvapi ATU err=%d\n",
1270-
err);
12711269
} else {
12721270
pr_info(PFX "Registered hvapi ATU major[%lu] minor[%lu]\n",
12731271
vatu_major, vatu_minor);

arch/sparc/kernel/pcic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
602602
{
603603
struct pci_dev *dev;
604604
int i, has_io, has_mem;
605-
unsigned int cmd;
605+
unsigned int cmd = 0;
606606
struct linux_pcic *pcic;
607607
/* struct linux_pbm_info* pbm = &pcic->pbm; */
608608
int node;

arch/sparc/lib/multi3.S

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
.align 4
66
ENTRY(__multi3) /* %o0 = u, %o1 = v */
77
mov %o1, %g1
8-
srl %o3, 0, %g4
9-
mulx %g4, %g1, %o1
8+
srl %o3, 0, %o4
9+
mulx %o4, %g1, %o1
1010
srlx %g1, 0x20, %g3
11-
mulx %g3, %g4, %g5
12-
sllx %g5, 0x20, %o5
13-
srl %g1, 0, %g4
11+
mulx %g3, %o4, %g7
12+
sllx %g7, 0x20, %o5
13+
srl %g1, 0, %o4
1414
sub %o1, %o5, %o5
1515
srlx %o5, 0x20, %o5
16-
addcc %g5, %o5, %g5
16+
addcc %g7, %o5, %g7
1717
srlx %o3, 0x20, %o5
18-
mulx %g4, %o5, %g4
18+
mulx %o4, %o5, %o4
1919
mulx %g3, %o5, %o5
2020
sethi %hi(0x80000000), %g3
21-
addcc %g5, %g4, %g5
22-
srlx %g5, 0x20, %g5
21+
addcc %g7, %o4, %g7
22+
srlx %g7, 0x20, %g7
2323
add %g3, %g3, %g3
2424
movcc %xcc, %g0, %g3
25-
addcc %o5, %g5, %o5
26-
sllx %g4, 0x20, %g4
27-
add %o1, %g4, %o1
25+
addcc %o5, %g7, %o5
26+
sllx %o4, 0x20, %o4
27+
add %o1, %o4, %o1
2828
add %o5, %g3, %g2
2929
mulx %g1, %o2, %g1
3030
add %g1, %g2, %g1

0 commit comments

Comments
 (0)