Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+5
-4
+1
-1
arch/mips/include/asm/uaccess.h
+1
-1
arch/mips/include/asm/uaccess.h
···
956
956
void __user * __cl_addr = (addr); \
957
957
unsigned long __cl_size = (n); \
958
958
if (__cl_size && access_ok(VERIFY_WRITE, \
959
-
((unsigned long)(__cl_addr)), __cl_size)) \
959
+
__cl_addr, __cl_size)) \
960
960
__cl_size = __clear_user(__cl_addr, __cl_size); \
961
961
__cl_size; \
962
962
})
+4
-3
arch/mips/sgi-ip32/ip32-reset.c
+4
-3
arch/mips/sgi-ip32/ip32-reset.c
···
53
53
54
54
static void ip32_machine_power_off(void)
55
55
{
56
-
volatile unsigned char reg_a, xctrl_a, xctrl_b;
56
+
unsigned char reg_a, xctrl_a, xctrl_b;
57
57
58
58
disable_irq(MACEISA_RTC_IRQ);
59
59
reg_a = CMOS_READ(RTC_REG_A);
···
91
91
92
92
static void debounce(unsigned long data)
93
93
{
94
-
volatile unsigned char reg_a, reg_c, xctrl_a;
94
+
unsigned char reg_a, reg_c, xctrl_a;
95
95
96
96
reg_c = CMOS_READ(RTC_INTR_FLAGS);
97
+
reg_a = CMOS_READ(RTC_REG_A);
97
98
CMOS_WRITE(reg_a | DS_REGA_DV0, RTC_REG_A);
98
99
wbflush();
99
100
xctrl_a = CMOS_READ(DS_B1_XCTRL4A);
···
138
137
139
138
static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
140
139
{
141
-
volatile unsigned char reg_c;
140
+
unsigned char reg_c;
142
141
143
142
reg_c = CMOS_READ(RTC_INTR_FLAGS);
144
143
if (!(reg_c & RTC_IRQF)) {