Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afc27887 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Remove unnecessary if not even harmful volatile keywords.
  MIPS: IP32: Fix build error due to uninitialized variable.
  MIPS: Fix sparse warning in incompatiable argument type of clear_user.
parents 1e787d13 d2f82c2f

arch/mips/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ __clear_user(void __user *addr, __kernel_size_t size) 
	void __user * __cl_addr = (addr);				\

	unsigned long __cl_size = (n);					\

	if (__cl_size && access_ok(VERIFY_WRITE,			\

		((unsigned long)(__cl_addr)), __cl_size))		\

					__cl_addr, __cl_size))		\

		__cl_size = __clear_user(__cl_addr, __cl_size);		\

	__cl_size;							\

})

arch/mips/sgi-ip32/ip32-reset.c

+4 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static inline void ip32_machine_halt(void) 


static void ip32_machine_power_off(void)

{

	volatile unsigned char reg_a, xctrl_a, xctrl_b;

	unsigned char reg_a, xctrl_a, xctrl_b;



	disable_irq(MACEISA_RTC_IRQ);

	reg_a = CMOS_READ(RTC_REG_A);
@@ -91,9 +91,10 @@ static void blink_timeout(unsigned long data) 


static void debounce(unsigned long data)

{

	volatile unsigned char reg_a, reg_c, xctrl_a;

	unsigned char reg_a, reg_c, xctrl_a;



	reg_c = CMOS_READ(RTC_INTR_FLAGS);

	reg_a = CMOS_READ(RTC_REG_A);

	CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);

	wbflush();

	xctrl_a = CMOS_READ(DS_B1_XCTRL4A);
@@ -137,7 +138,7 @@ static inline void ip32_power_button(void) 


static irqreturn_t ip32_rtc_int(int irq, void *dev_id)

{

	volatile unsigned char reg_c;

	unsigned char reg_c;



	reg_c = CMOS_READ(RTC_INTR_FLAGS);

	if (!(reg_c & RTC_IRQF)) {