Skip to content

Commit 7bfb857

Browse files
tiwaitiwai
committed
Merge branch 'topic/line6' into for-next
2 parents 6c869d3 + 61864d8 commit 7bfb857

File tree

223 files changed

+2480
-1774
lines changed

Some content is hidden

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

223 files changed

+2480
-1774
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <[email protected]>
5151
Greg Kroah-Hartman <[email protected]>
5252
Henk Vergonet <[email protected]>
5353
Henrik Kretzschmar <[email protected]>
54+
Henrik Rydberg <[email protected]>
5455
Herbert Xu <[email protected]>
5556
Jacob Shin <[email protected]>
5657
James Bottomley <jejb@mulgrave.(none)>

‎MAINTAINERS

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -724,15 +724,15 @@ F: include/uapi/linux/apm_bios.h
724724
F: drivers/char/apm-emulation.c
725725

726726
APPLE BCM5974 MULTITOUCH DRIVER
727-
M: Henrik Rydberg <rydberg@euromail.se>
727+
M: Henrik Rydberg <rydberg@bitmath.org>
728728
L: [email protected]
729-
S: Maintained
729+
S: Odd fixes
730730
F: drivers/input/mouse/bcm5974.c
731731

732732
APPLE SMC DRIVER
733-
M: Henrik Rydberg <rydberg@euromail.se>
733+
M: Henrik Rydberg <rydberg@bitmath.org>
734734
L: [email protected]
735-
S: Maintained
735+
S: Odd fixes
736736
F: drivers/hwmon/applesmc.c
737737

738738
APPLETALK NETWORK LAYER
@@ -2259,6 +2259,7 @@ F: drivers/gpio/gpio-bt8xx.c
22592259
BTRFS FILE SYSTEM
22602260
M: Chris Mason <[email protected]>
22612261
M: Josef Bacik <[email protected]>
2262+
M: David Sterba <[email protected]>
22622263
L: [email protected]
22632264
W: http://btrfs.wiki.kernel.org/
22642265
Q: http://patchwork.kernel.org/project/linux-btrfs/list/
@@ -4940,10 +4941,10 @@ F: include/uapi/linux/input.h
49404941
F: include/linux/input/
49414942

49424943
INPUT MULTITOUCH (MT) PROTOCOL
4943-
M: Henrik Rydberg <rydberg@euromail.se>
4944+
M: Henrik Rydberg <rydberg@bitmath.org>
49444945
L: [email protected]
49454946
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
4946-
S: Maintained
4947+
S: Odd fixes
49474948
F: Documentation/input/multi-touch-protocol.txt
49484949
F: drivers/input/input-mt.c
49494950
K: \b(ABS|SYN)_MT_

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 19
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = Diseased Newt
66

77
# *DOCUMENTATION*
@@ -391,6 +391,7 @@ USERINCLUDE := \
391391
# Needed to be compatible with the O= option
392392
LINUXINCLUDE := \
393393
-I$(srctree)/arch/$(hdr-arch)/include \
394+
-Iarch/$(hdr-arch)/include/generated/uapi \
394395
-Iarch/$(hdr-arch)/include/generated \
395396
$(if $(KBUILD_SRC), -I$(srctree)/include) \
396397
-Iinclude \

‎arch/arm/include/uapi/asm/unistd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@
413413
#define __NR_getrandom (__NR_SYSCALL_BASE+384)
414414
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
415415
#define __NR_bpf (__NR_SYSCALL_BASE+386)
416+
#define __NR_execveat (__NR_SYSCALL_BASE+387)
416417

417418
/*
418419
* The following SWIs are ARM private.

‎arch/arm/kernel/calls.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@
396396
CALL(sys_getrandom)
397397
/* 385 */ CALL(sys_memfd_create)
398398
CALL(sys_bpf)
399+
CALL(sys_execveat)
399400
#ifndef syscalls_counted
400401
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
401402
#define syscalls_counted

‎arch/arm/kernel/perf_regs.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,11 @@ u64 perf_reg_abi(struct task_struct *task)
2828
{
2929
return PERF_SAMPLE_REGS_ABI_32;
3030
}
31+
32+
void perf_get_regs_user(struct perf_regs *regs_user,
33+
struct pt_regs *regs,
34+
struct pt_regs *regs_user_copy)
35+
{
36+
regs_user->regs = task_pt_regs(current);
37+
regs_user->abi = perf_reg_abi(current);
38+
}

‎arch/arm/mm/dump.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level, u
220220
static const char units[] = "KMGTPE";
221221
u64 prot = val & pg_level[level].mask;
222222

223-
if (addr < USER_PGTABLES_CEILING)
224-
return;
225-
226223
if (!st->level) {
227224
st->level = level;
228225
st->current_prot = prot;
@@ -308,15 +305,13 @@ static void walk_pgd(struct seq_file *m)
308305
pgd_t *pgd = swapper_pg_dir;
309306
struct pg_state st;
310307
unsigned long addr;
311-
unsigned i, pgdoff = USER_PGTABLES_CEILING / PGDIR_SIZE;
308+
unsigned i;
312309

313310
memset(&st, 0, sizeof(st));
314311
st.seq = m;
315312
st.marker = address_markers;
316313

317-
pgd += pgdoff;
318-
319-
for (i = pgdoff; i < PTRS_PER_PGD; i++, pgd++) {
314+
for (i = 0; i < PTRS_PER_PGD; i++, pgd++) {
320315
addr = i * PGDIR_SIZE;
321316
if (!pgd_none(*pgd)) {
322317
walk_pud(&st, pgd, addr);

‎arch/arm/mm/init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,8 +658,8 @@ static struct section_perm ro_perms[] = {
658658
.start = (unsigned long)_stext,
659659
.end = (unsigned long)__init_begin,
660660
#ifdef CONFIG_ARM_LPAE
661-
.mask = ~PMD_SECT_RDONLY,
662-
.prot = PMD_SECT_RDONLY,
661+
.mask = ~L_PMD_SECT_RDONLY,
662+
.prot = L_PMD_SECT_RDONLY,
663663
#else
664664
.mask = ~(PMD_SECT_APX | PMD_SECT_AP_WRITE),
665665
.prot = PMD_SECT_APX | PMD_SECT_AP_WRITE,

‎arch/arm/mm/mmu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,8 @@ static void __init kmap_init(void)
13291329
static void __init map_lowmem(void)
13301330
{
13311331
struct memblock_region *reg;
1332-
unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
1333-
unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
1332+
phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
1333+
phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
13341334

13351335
/* Map all the lowmem memory banks. */
13361336
for_each_memblock(memory, reg) {

‎arch/arm64/include/asm/arch_timer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <asm/barrier.h>
2323

24+
#include <linux/bug.h>
2425
#include <linux/init.h>
2526
#include <linux/types.h>
2627

‎arch/arm64/include/asm/cpu.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ struct cpuinfo_arm64 {
3939
u64 reg_id_aa64pfr0;
4040
u64 reg_id_aa64pfr1;
4141

42+
u32 reg_id_dfr0;
4243
u32 reg_id_isar0;
4344
u32 reg_id_isar1;
4445
u32 reg_id_isar2;
@@ -51,6 +52,10 @@ struct cpuinfo_arm64 {
5152
u32 reg_id_mmfr3;
5253
u32 reg_id_pfr0;
5354
u32 reg_id_pfr1;
55+
56+
u32 reg_mvfr0;
57+
u32 reg_mvfr1;
58+
u32 reg_mvfr2;
5459
};
5560

5661
DECLARE_PER_CPU(struct cpuinfo_arm64, cpu_data);

‎arch/arm64/include/asm/processor.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include <asm/fpsimd.h>
3333
#include <asm/hw_breakpoint.h>
34+
#include <asm/pgtable-hwdef.h>
3435
#include <asm/ptrace.h>
3536
#include <asm/types.h>
3637

@@ -123,9 +124,6 @@ struct task_struct;
123124
/* Free all resources held by a thread. */
124125
extern void release_thread(struct task_struct *);
125126

126-
/* Prepare to copy thread state - unlazy all lazy status */
127-
#define prepare_to_copy(tsk) do { } while (0)
128-
129127
unsigned long get_wchan(struct task_struct *p);
130128

131129
#define cpu_relax() barrier()

‎arch/arm64/include/asm/unistd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2)
4545
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5)
4646

47-
#define __NR_compat_syscalls 386
47+
#define __NR_compat_syscalls 387
4848
#endif
4949

5050
#define __ARCH_WANT_SYS_CLONE

‎arch/arm64/kernel/cpuinfo.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ static void cpuinfo_sanity_check(struct cpuinfo_arm64 *cur)
147147
* If we have AArch32, we care about 32-bit features for compat. These
148148
* registers should be RES0 otherwise.
149149
*/
150+
diff |= CHECK(id_dfr0, boot, cur, cpu);
150151
diff |= CHECK(id_isar0, boot, cur, cpu);
151152
diff |= CHECK(id_isar1, boot, cur, cpu);
152153
diff |= CHECK(id_isar2, boot, cur, cpu);
@@ -165,6 +166,10 @@ static void cpuinfo_sanity_check(struct cpuinfo_arm64 *cur)
165166
diff |= CHECK(id_pfr0, boot, cur, cpu);
166167
diff |= CHECK(id_pfr1, boot, cur, cpu);
167168

169+
diff |= CHECK(mvfr0, boot, cur, cpu);
170+
diff |= CHECK(mvfr1, boot, cur, cpu);
171+
diff |= CHECK(mvfr2, boot, cur, cpu);
172+
168173
/*
169174
* Mismatched CPU features are a recipe for disaster. Don't even
170175
* pretend to support them.
@@ -189,6 +194,7 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)
189194
info->reg_id_aa64pfr0 = read_cpuid(ID_AA64PFR0_EL1);
190195
info->reg_id_aa64pfr1 = read_cpuid(ID_AA64PFR1_EL1);
191196

197+
info->reg_id_dfr0 = read_cpuid(ID_DFR0_EL1);
192198
info->reg_id_isar0 = read_cpuid(ID_ISAR0_EL1);
193199
info->reg_id_isar1 = read_cpuid(ID_ISAR1_EL1);
194200
info->reg_id_isar2 = read_cpuid(ID_ISAR2_EL1);
@@ -202,6 +208,10 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)
202208
info->reg_id_pfr0 = read_cpuid(ID_PFR0_EL1);
203209
info->reg_id_pfr1 = read_cpuid(ID_PFR1_EL1);
204210

211+
info->reg_mvfr0 = read_cpuid(MVFR0_EL1);
212+
info->reg_mvfr1 = read_cpuid(MVFR1_EL1);
213+
info->reg_mvfr2 = read_cpuid(MVFR2_EL1);
214+
205215
cpuinfo_detect_icache_policy(info);
206216

207217
check_local_cpu_errata();

‎arch/arm64/kernel/efi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ void __init efi_idmap_init(void)
326326

327327
/* boot time idmap_pg_dir is incomplete, so fill in missing parts */
328328
efi_setup_idmap();
329+
early_memunmap(memmap.map, memmap.map_end - memmap.map);
329330
}
330331

331332
static int __init remap_region(efi_memory_desc_t *md, void **new)
@@ -380,7 +381,6 @@ static int __init arm64_enter_virtual_mode(void)
380381
}
381382

382383
mapsize = memmap.map_end - memmap.map;
383-
early_memunmap(memmap.map, mapsize);
384384

385385
if (efi_runtime_disabled()) {
386386
pr_info("EFI runtime services will be disabled.\n");

‎arch/arm64/kernel/module.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <linux/mm.h>
2626
#include <linux/moduleloader.h>
2727
#include <linux/vmalloc.h>
28+
#include <asm/alternative.h>
2829
#include <asm/insn.h>
2930
#include <asm/sections.h>
3031

‎arch/arm64/kernel/perf_regs.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,11 @@ u64 perf_reg_abi(struct task_struct *task)
5050
else
5151
return PERF_SAMPLE_REGS_ABI_64;
5252
}
53+
54+
void perf_get_regs_user(struct perf_regs *regs_user,
55+
struct pt_regs *regs,
56+
struct pt_regs *regs_user_copy)
57+
{
58+
regs_user->regs = task_pt_regs(current);
59+
regs_user->abi = perf_reg_abi(current);
60+
}

‎arch/arm64/kernel/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ void __init setup_arch(char **cmdline_p)
402402
request_standard_resources();
403403

404404
efi_idmap_init();
405+
early_ioremap_reset();
405406

406407
unflatten_device_tree();
407408

‎arch/arm64/kernel/smp_spin_table.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <asm/cacheflush.h>
2626
#include <asm/cpu_ops.h>
2727
#include <asm/cputype.h>
28+
#include <asm/io.h>
2829
#include <asm/smp_plat.h>
2930

3031
extern void secondary_holding_pen(void);

‎arch/blackfin/mach-bf533/boards/stamp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88

99
#include <linux/device.h>
10+
#include <linux/delay.h>
1011
#include <linux/platform_device.h>
1112
#include <linux/mtd/mtd.h>
1213
#include <linux/mtd/partitions.h>

‎arch/ia64/kernel/acpi.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -893,13 +893,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
893893
}
894894

895895
/* wrapper to silence section mismatch warning */
896-
int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)
896+
int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu)
897897
{
898898
return _acpi_map_lsapic(handle, physid, pcpu);
899899
}
900-
EXPORT_SYMBOL(acpi_map_lsapic);
900+
EXPORT_SYMBOL(acpi_map_cpu);
901901

902-
int acpi_unmap_lsapic(int cpu)
902+
int acpi_unmap_cpu(int cpu)
903903
{
904904
ia64_cpu_to_sapicid[cpu] = -1;
905905
set_cpu_present(cpu, false);
@@ -910,8 +910,7 @@ int acpi_unmap_lsapic(int cpu)
910910

911911
return (0);
912912
}
913-
914-
EXPORT_SYMBOL(acpi_unmap_lsapic);
913+
EXPORT_SYMBOL(acpi_unmap_cpu);
915914
#endif /* CONFIG_ACPI_HOTPLUG_CPU */
916915

917916
#ifdef CONFIG_ACPI_NUMA

‎arch/x86/boot/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ targets += cpustr.h
5151
$(obj)/cpustr.h: $(obj)/mkcpustr FORCE
5252
$(call if_changed,cpustr)
5353
endif
54+
clean-files += cpustr.h
5455

5556
# ---------------------------------------------------------------------------
5657

‎arch/x86/crypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o
2626

2727
obj-$(CONFIG_CRYPTO_CRC32C_INTEL) += crc32c-intel.o
2828
obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o
29-
obj-$(CONFIG_CRYPTO_SHA1_MB) += sha-mb/
3029
obj-$(CONFIG_CRYPTO_CRC32_PCLMUL) += crc32-pclmul.o
3130
obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o
3231
obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o
@@ -46,6 +45,7 @@ endif
4645
ifeq ($(avx2_supported),yes)
4746
obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
4847
obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
48+
obj-$(CONFIG_CRYPTO_SHA1_MB) += sha-mb/
4949
endif
5050

5151
aes-i586-y := aes-i586-asm_32.o aes_glue.o

0 commit comments

Comments
 (0)