Skip to content

Commit 0f64688

Browse files
author
Alex Shi
committed
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
2 parents 00236b0 + 81ab793 commit 0f64688

101 files changed

Lines changed: 698 additions & 440 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 4
3-
SUBLEVEL = 102
3+
SUBLEVEL = 103
44
EXTRAVERSION =
55
NAME = Blurry Fish Butt
66

‎arch/arm/mm/dump.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ static const struct prot_bits section_bits[] = {
126126
.val = PMD_SECT_USER,
127127
.set = "USR",
128128
}, {
129-
.mask = L_PMD_SECT_RDONLY,
130-
.val = L_PMD_SECT_RDONLY,
129+
.mask = L_PMD_SECT_RDONLY | PMD_SECT_AP2,
130+
.val = L_PMD_SECT_RDONLY | PMD_SECT_AP2,
131131
.set = "ro",
132132
.clear = "RW",
133133
#elif __LINUX_ARM_ARCH__ >= 6

‎arch/arm/mm/init.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,8 @@ static struct section_perm ro_perms[] = {
611611
.start = (unsigned long)_stext,
612612
.end = (unsigned long)__init_begin,
613613
#ifdef CONFIG_ARM_LPAE
614-
.mask = ~L_PMD_SECT_RDONLY,
615-
.prot = L_PMD_SECT_RDONLY,
614+
.mask = ~(L_PMD_SECT_RDONLY | PMD_SECT_AP2),
615+
.prot = L_PMD_SECT_RDONLY | PMD_SECT_AP2,
616616
#else
617617
.mask = ~(PMD_SECT_APX | PMD_SECT_AP_WRITE),
618618
.prot = PMD_SECT_APX | PMD_SECT_AP_WRITE,

‎arch/mips/bcm47xx/leds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ bcm47xx_leds_linksys_wrt54g3gv2[] __initconst = {
330330
/* Verified on: WRT54GS V1.0 */
331331
static const struct gpio_led
332332
bcm47xx_leds_linksys_wrt54g_type_0101[] __initconst = {
333-
BCM47XX_GPIO_LED(0, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
333+
BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
334334
BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
335335
BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
336336
};

‎arch/mips/kernel/ptrace.c‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,19 @@ static const struct user_regset_view user_mips64_view = {
650650
.n = ARRAY_SIZE(mips64_regsets),
651651
};
652652

653+
#ifdef CONFIG_MIPS32_N32
654+
655+
static const struct user_regset_view user_mipsn32_view = {
656+
.name = "mipsn32",
657+
.e_flags = EF_MIPS_ABI2,
658+
.e_machine = ELF_ARCH,
659+
.ei_osabi = ELF_OSABI,
660+
.regsets = mips64_regsets,
661+
.n = ARRAY_SIZE(mips64_regsets),
662+
};
663+
664+
#endif /* CONFIG_MIPS32_N32 */
665+
653666
#endif /* CONFIG_64BIT */
654667

655668
const struct user_regset_view *task_user_regset_view(struct task_struct *task)
@@ -660,6 +673,10 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
660673
#ifdef CONFIG_MIPS32_O32
661674
if (test_tsk_thread_flag(task, TIF_32BIT_REGS))
662675
return &user_mips_view;
676+
#endif
677+
#ifdef CONFIG_MIPS32_N32
678+
if (test_tsk_thread_flag(task, TIF_32BIT_ADDR))
679+
return &user_mipsn32_view;
663680
#endif
664681
return &user_mips64_view;
665682
#endif

‎arch/mips/ralink/mt7620.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ static struct rt2880_pmx_func i2c_grp_mt7628[] = {
141141
FUNC("i2c", 0, 4, 2),
142142
};
143143

144-
static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };
145-
static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };
144+
static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("refclk", 0, 37, 1) };
145+
static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 36, 1) };
146146
static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
147147
static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
148148

‎arch/parisc/kernel/syscall.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -688,15 +688,15 @@ cas_action:
688688
/* ELF32 Process entry path */
689689
lws_compare_and_swap_2:
690690
#ifdef CONFIG_64BIT
691-
/* Clip the input registers */
691+
/* Clip the input registers. We don't need to clip %r23 as we
692+
only use it for word operations */
692693
depdi 0, 31, 32, %r26
693694
depdi 0, 31, 32, %r25
694695
depdi 0, 31, 32, %r24
695-
depdi 0, 31, 32, %r23
696696
#endif
697697

698698
/* Check the validity of the size pointer */
699-
subi,>>= 4, %r23, %r0
699+
subi,>>= 3, %r23, %r0
700700
b,n lws_exit_nosys
701701

702702
/* Jump to the functions which will load the old and new values into

‎arch/powerpc/kernel/signal.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static void check_syscall_restart(struct pt_regs *regs, struct k_sigaction *ka,
102102
static void do_signal(struct pt_regs *regs)
103103
{
104104
sigset_t *oldset = sigmask_to_save();
105-
struct ksignal ksig;
105+
struct ksignal ksig = { .sig = 0 };
106106
int ret;
107107
int is32 = is_32bit_task();
108108

‎arch/s390/include/asm/asm-prototypes.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef _ASM_S390_PROTOTYPES_H
2+
3+
#include <linux/kvm_host.h>
4+
#include <linux/ftrace.h>
5+
#include <asm/fpu/api.h>
6+
#include <asm-generic/asm-prototypes.h>
7+
8+
#endif /* _ASM_S390_PROTOTYPES_H */

‎arch/s390/include/asm/switch_to.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ static inline void restore_access_regs(unsigned int *acrs)
3434
save_access_regs(&prev->thread.acrs[0]); \
3535
save_ri_cb(prev->thread.ri_cb); \
3636
} \
37+
update_cr_regs(next); \
3738
if (next->mm) { \
38-
update_cr_regs(next); \
3939
set_cpu_flag(CIF_FPU); \
4040
restore_access_regs(&next->thread.acrs[0]); \
4141
restore_ri_cb(next->thread.ri_cb, prev->thread.ri_cb); \

0 commit comments

Comments
 (0)