Commit 0bd2afc7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fixes from James Hogan:
 "A couple of MIPS fixes for 4.16-rc1, including an important regression
  in 4.15 and a rather more longstanding corner case build fix.

  These are separate from the main pull request as one of the bugs fixed
  was only recently introduced in v4.15-rc8.

   - Fix CPS regression on older binutils due to MIPS_ISA_LEVEL_RAW fix
     (4.15)

   - Fix allmodconfig + CONFIG_MACH_TX49XX=y builds due to incorrect use
     of IS_ENABLED() (2.6.28)"

* tag 'mips_fixes_4.16_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS
  MIPS: CPS: Fix MIPS_ISA_LEVEL_RAW fallout
parents 85789536 0cde5b44

arch/mips/kernel/cps-vec.S

+12 −5
Original line number Diff line number Diff line
@@ -388,15 +388,16 @@ LEAF(mips_cps_boot_vpes) 


#elif defined(CONFIG_MIPS_MT)



	.set	push

	.set	MIPS_ISA_LEVEL_RAW

	.set	mt



	/* If the core doesn't support MT then return */

	has_mt	t0, 5f



	/* Enter VPE configuration state */

	.set	push

	.set	MIPS_ISA_LEVEL_RAW

	.set	mt

	dvpe

	.set	pop



	PTR_LA	t1, 1f

	jr.hb	t1

	 nop
@@ -422,6 +423,10 @@ LEAF(mips_cps_boot_vpes) 
	mtc0	t0, CP0_VPECONTROL

	ehb



	.set	push

	.set	MIPS_ISA_LEVEL_RAW

	.set	mt



	/* Skip the VPE if its TC is not halted */

	mftc0	t0, CP0_TCHALT

	beqz	t0, 2f
@@ -495,6 +500,8 @@ LEAF(mips_cps_boot_vpes) 
	ehb

	evpe



	.set	pop



	/* Check whether this VPE is meant to be running */

	li	t0, 1

	sll	t0, t0, a1
@@ -509,7 +516,7 @@ LEAF(mips_cps_boot_vpes) 
1:	jr.hb	t0

	 nop



2:	.set	pop

2:



#endif /* CONFIG_MIPS_MT_SMP */

arch/mips/txx9/rbtx4939/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void __init rbtx4939_update_ioc_pen(void) 


#define RBTX4939_MAX_7SEGLEDS	8



#if IS_ENABLED(CONFIG_LEDS_CLASS)

#if IS_BUILTIN(CONFIG_LEDS_CLASS)

static u8 led_val[RBTX4939_MAX_7SEGLEDS];

struct rbtx4939_led_data {

	struct led_classdev cdev;
@@ -261,7 +261,7 @@ static inline void rbtx4939_led_setup(void) 


static void __rbtx4939_7segled_putc(unsigned int pos, unsigned char val)

{

#if IS_ENABLED(CONFIG_LEDS_CLASS)

#if IS_BUILTIN(CONFIG_LEDS_CLASS)

	unsigned long flags;

	local_irq_save(flags);

	/* bit7: reserved for LED class */

CRA Git | Maintained and supported by SUSTech CRA and CCSE