Skip to content

Commit b079115

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker driver, nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents 52a623b + 4d8a991 commit b079115

File tree

200 files changed

+1392
-881
lines changed

Some content is hidden

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

200 files changed

+1392
-881
lines changed

‎Documentation/devicetree/bindings/gpio/gpio-mvebu.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ Required properties:
4141
Optional properties:
4242

4343
In order to use the GPIO lines in PWM mode, some additional optional
44-
properties are required. Only Armada 370 and XP support these properties.
44+
properties are required.
4545

46-
- compatible: Must contain "marvell,armada-370-xp-gpio"
46+
- compatible: Must contain "marvell,armada-370-gpio"
4747

4848
- reg: an additional register set is needed, for the GPIO Blink
4949
Counter on/off registers.
@@ -71,7 +71,7 @@ Example:
7171
};
7272

7373
gpio1: gpio@18140 {
74-
compatible = "marvell,armada-370-xp-gpio";
74+
compatible = "marvell,armada-370-gpio";
7575
reg = <0x18140 0x40>, <0x181c8 0x08>;
7676
reg-names = "gpio", "pwm";
7777
ngpios = <17>;

‎Documentation/devicetree/bindings/mfd/stm32-timers.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Example:
3131
compatible = "st,stm32-timers";
3232
reg = <0x40010000 0x400>;
3333
clocks = <&rcc 0 160>;
34-
clock-names = "clk_int";
34+
clock-names = "int";
3535

3636
pwm {
3737
compatible = "st,stm32-pwm";

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2964,7 +2964,7 @@ F: sound/pci/oxygen/
29642964

29652965
C6X ARCHITECTURE
29662966
M: Mark Salter <msalter@redhat.com>
2967-
M: Aurelien Jacquiot <a-jacquiot@ti.com>
2967+
M: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
29682968
L: linux-c6x-dev@linux-c6x.org
29692969
W: http://www.linux-c6x.org/wiki/index.php/Main_Page
29702970
S: Maintained

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 4
22
PATCHLEVEL = 12
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc6
4+
EXTRAVERSION = -rc7
55
NAME = Fearless Coyote
66

77
# *DOCUMENTATION*
@@ -1437,7 +1437,7 @@ help:
14371437
@echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'
14381438
@echo ' make V=2 [targets] 2 => give reason for rebuild of target'
14391439
@echo ' make O=dir [targets] Locate all output files in "dir", including .config'
1440-
@echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)'
1440+
@echo ' make C=1 [targets] Check re-compiled c source with $$CHECK (sparse by default)'
14411441
@echo ' make C=2 [targets] Force check of all c source with $$CHECK'
14421442
@echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
14431443
@echo ' make W=n [targets] Enable extra gcc checks, n=1,2,3 where'

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ struct task_struct;
8686
#define TSK_K_BLINK(tsk) TSK_K_REG(tsk, 4)
8787
#define TSK_K_FP(tsk) TSK_K_REG(tsk, 0)
8888

89-
#define thread_saved_pc(tsk) TSK_K_BLINK(tsk)
90-
9189
extern void start_thread(struct pt_regs * regs, unsigned long pc,
9290
unsigned long usp);
9391

‎arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,7 @@ choice
14161416
config VMSPLIT_3G
14171417
bool "3G/1G user/kernel split"
14181418
config VMSPLIT_3G_OPT
1419+
depends on !ARM_LPAE
14191420
bool "3G/1G user/kernel split (for full 1G low memory)"
14201421
config VMSPLIT_2G
14211422
bool "2G/2G user/kernel split"

‎arch/arm/boot/compressed/efi-header.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
@ there.
1818
.inst 'M' | ('Z' << 8) | (0x1310 << 16) @ tstne r0, #0x4d000
1919
#else
20-
W(mov) r0, r0
20+
AR_CLASS( mov r0, r0 )
21+
M_CLASS( nop.w )
2122
#endif
2223
.endm
2324

‎arch/arm/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ static void __init cacheid_init(void)
315315
if (arch >= CPU_ARCH_ARMv6) {
316316
unsigned int cachetype = read_cpuid_cachetype();
317317

318-
if ((arch == CPU_ARCH_ARMv7M) && !cachetype) {
318+
if ((arch == CPU_ARCH_ARMv7M) && !(cachetype & 0xf000f)) {
319319
cacheid = 0;
320320
} else if ((cachetype & (7 << 29)) == 4 << 29) {
321321
/* ARMv7 register format */

‎arch/arm64/kernel/vdso.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,11 @@ void update_vsyscall(struct timekeeper *tk)
221221
/* tkr_mono.cycle_last == tkr_raw.cycle_last */
222222
vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last;
223223
vdso_data->raw_time_sec = tk->raw_time.tv_sec;
224-
vdso_data->raw_time_nsec = tk->raw_time.tv_nsec;
224+
vdso_data->raw_time_nsec = (tk->raw_time.tv_nsec <<
225+
tk->tkr_raw.shift) +
226+
tk->tkr_raw.xtime_nsec;
225227
vdso_data->xtime_clock_sec = tk->xtime_sec;
226228
vdso_data->xtime_clock_nsec = tk->tkr_mono.xtime_nsec;
227-
/* tkr_raw.xtime_nsec == 0 */
228229
vdso_data->cs_mono_mult = tk->tkr_mono.mult;
229230
vdso_data->cs_raw_mult = tk->tkr_raw.mult;
230231
/* tkr_mono.shift == tkr_raw.shift */

‎arch/arm64/kernel/vdso/gettimeofday.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ monotonic_raw:
256256
seqcnt_check fail=monotonic_raw
257257

258258
/* All computations are done with left-shifted nsecs. */
259-
lsl x14, x14, x12
260259
get_nsec_per_sec res=x9
261260
lsl x9, x9, x12
262261

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ static inline void release_thread(struct task_struct *dead_task)
7575
{
7676
}
7777

78-
/*
79-
* Return saved PC of a blocked thread.
80-
*/
81-
#define thread_saved_pc(tsk) (tsk->thread.pc)
82-
8378
unsigned long get_wchan(struct task_struct *p);
8479

8580
#define KSTK_EIP(tsk) \

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,6 @@ static inline void release_thread(struct task_struct *dead_task)
9595
#define copy_segments(tsk, mm) do { } while (0)
9696
#define release_segments(mm) do { } while (0)
9797

98-
/*
99-
* saved PC of a blocked thread.
100-
*/
101-
#define thread_saved_pc(tsk) (task_pt_regs(tsk)->pc)
102-
10398
/*
10499
* saved kernel SP and DP of a blocked thread.
105100
*/

‎arch/cris/arch-v10/kernel/process.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,6 @@ void hard_reset_now (void)
6969
while(1) /* waiting for RETRIBUTION! */ ;
7070
}
7171

72-
/*
73-
* Return saved PC of a blocked thread.
74-
*/
75-
unsigned long thread_saved_pc(struct task_struct *t)
76-
{
77-
return task_pt_regs(t)->irp;
78-
}
79-
8072
/* setup the child's kernel stack with a pt_regs and switch_stack on it.
8173
* it will be un-nested during _resume and _ret_from_sys_call when the
8274
* new thread is scheduled.

‎arch/cris/arch-v32/kernel/process.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,6 @@ hard_reset_now(void)
8484
; /* Wait for reset. */
8585
}
8686

87-
/*
88-
* Return saved PC of a blocked thread.
89-
*/
90-
unsigned long thread_saved_pc(struct task_struct *t)
91-
{
92-
return task_pt_regs(t)->erp;
93-
}
94-
9587
/*
9688
* Setup the child's kernel stack with a pt_regs and call switch_stack() on it.
9789
* It will be unnested during _resume and _ret_from_sys_call when the new thread

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ unsigned long get_wchan(struct task_struct *p);
5252

5353
#define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp)
5454

55-
extern unsigned long thread_saved_pc(struct task_struct *tsk);
56-
5755
/* Free all resources held by a thread. */
5856
static inline void release_thread(struct task_struct *dead_task)
5957
{

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ extern asmlinkage void *restore_user_regs(const struct user_context *target, ...
9696
#define release_segments(mm) do { } while (0)
9797
#define forget_segments() do { } while (0)
9898

99-
/*
100-
* Return saved PC of a blocked thread.
101-
*/
102-
extern unsigned long thread_saved_pc(struct task_struct *tsk);
103-
10499
unsigned long get_wchan(struct task_struct *p);
105100

106101
#define KSTK_EIP(tsk) ((tsk)->thread.frame0->pc)

‎arch/frv/kernel/process.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,6 @@ unsigned long get_wchan(struct task_struct *p)
198198
return 0;
199199
}
200200

201-
unsigned long thread_saved_pc(struct task_struct *tsk)
202-
{
203-
/* Check whether the thread is blocked in resume() */
204-
if (in_sched_functions(tsk->thread.pc))
205-
return ((unsigned long *)tsk->thread.fp)[2];
206-
else
207-
return tsk->thread.pc;
208-
}
209-
210201
int elf_check_arch(const struct elf32_hdr *hdr)
211202
{
212203
unsigned long hsr0 = __get_HSR(0);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ static inline void release_thread(struct task_struct *dead_task)
110110
{
111111
}
112112

113-
/*
114-
* Return saved PC of a blocked thread.
115-
*/
116-
unsigned long thread_saved_pc(struct task_struct *tsk);
117113
unsigned long get_wchan(struct task_struct *p);
118114

119115
#define KSTK_EIP(tsk) \

‎arch/h8300/kernel/process.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ int copy_thread(unsigned long clone_flags,
129129
return 0;
130130
}
131131

132-
unsigned long thread_saved_pc(struct task_struct *tsk)
133-
{
134-
return ((struct pt_regs *)tsk->thread.esp0)->pc;
135-
}
136-
137132
unsigned long get_wchan(struct task_struct *p)
138133
{
139134
unsigned long fp, pc;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
/* task_struct, defined elsewhere, is the "process descriptor" */
3434
struct task_struct;
3535

36-
/* this is defined in arch/process.c */
37-
extern unsigned long thread_saved_pc(struct task_struct *tsk);
38-
3936
extern void start_thread(struct pt_regs *, unsigned long, unsigned long);
4037

4138
/*

‎arch/hexagon/kernel/process.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ void arch_cpu_idle(void)
6060
local_irq_enable();
6161
}
6262

63-
/*
64-
* Return saved PC of a blocked thread
65-
*/
66-
unsigned long thread_saved_pc(struct task_struct *tsk)
67-
{
68-
return 0;
69-
}
70-
7163
/*
7264
* Copy architecture-specific thread state
7365
*/

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -601,23 +601,6 @@ ia64_set_unat (__u64 *unat, void *spill_addr, unsigned long nat)
601601
*unat = (*unat & ~mask) | (nat << bit);
602602
}
603603

604-
/*
605-
* Return saved PC of a blocked thread.
606-
* Note that the only way T can block is through a call to schedule() -> switch_to().
607-
*/
608-
static inline unsigned long
609-
thread_saved_pc (struct task_struct *t)
610-
{
611-
struct unw_frame_info info;
612-
unsigned long ip;
613-
614-
unw_init_from_blocked_task(&info, t);
615-
if (unw_unwind(&info) < 0)
616-
return 0;
617-
unw_get_ip(&info, &ip);
618-
return ip;
619-
}
620-
621604
/*
622605
* Get the current instruction/program counter value.
623606
*/

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ extern void release_thread(struct task_struct *);
122122
extern void copy_segments(struct task_struct *p, struct mm_struct * mm);
123123
extern void release_segments(struct mm_struct * mm);
124124

125-
extern unsigned long thread_saved_pc(struct task_struct *);
126-
127125
/* Copy and release all segment info associated with a VM */
128126
#define copy_segments(p, mm) do { } while (0)
129127
#define release_segments(mm) do { } while (0)

‎arch/m32r/kernel/process.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@
3939

4040
#include <linux/err.h>
4141

42-
/*
43-
* Return saved PC of a blocked thread.
44-
*/
45-
unsigned long thread_saved_pc(struct task_struct *tsk)
46-
{
47-
return tsk->thread.lr;
48-
}
49-
5042
void (*pm_power_off)(void) = NULL;
5143
EXPORT_SYMBOL(pm_power_off);
5244

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ static inline void release_thread(struct task_struct *dead_task)
130130
{
131131
}
132132

133-
extern unsigned long thread_saved_pc(struct task_struct *tsk);
134-
135133
unsigned long get_wchan(struct task_struct *p);
136134

137135
#define KSTK_EIP(tsk) \

‎arch/m68k/kernel/process.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,6 @@
4040
asmlinkage void ret_from_fork(void);
4141
asmlinkage void ret_from_kernel_thread(void);
4242

43-
44-
/*
45-
* Return saved PC from a blocked thread
46-
*/
47-
unsigned long thread_saved_pc(struct task_struct *tsk)
48-
{
49-
struct switch_stack *sw = (struct switch_stack *)tsk->thread.ksp;
50-
/* Check whether the thread is blocked in resume() */
51-
if (in_sched_functions(sw->retpc))
52-
return ((unsigned long *)sw->a6)[1];
53-
else
54-
return sw->retpc;
55-
}
56-
5743
void arch_cpu_idle(void)
5844
{
5945
#if defined(MACH_ATARI_ONLY)

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ static inline void release_thread(struct task_struct *dead_task)
6969
{
7070
}
7171

72-
extern unsigned long thread_saved_pc(struct task_struct *t);
73-
7472
extern unsigned long get_wchan(struct task_struct *p);
7573

7674
# define KSTK_EIP(tsk) (0)
@@ -121,10 +119,6 @@ static inline void release_thread(struct task_struct *dead_task)
121119
{
122120
}
123121

124-
/* Return saved (kernel) PC of a blocked thread. */
125-
# define thread_saved_pc(tsk) \
126-
((tsk)->thread.regs ? (tsk)->thread.regs->r15 : 0)
127-
128122
unsigned long get_wchan(struct task_struct *p);
129123

130124
/* The size allocated for kernel stacks. This _must_ be a power of two! */

‎arch/microblaze/kernel/process.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -119,23 +119,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
119119
return 0;
120120
}
121121

122-
#ifndef CONFIG_MMU
123-
/*
124-
* Return saved PC of a blocked thread.
125-
*/
126-
unsigned long thread_saved_pc(struct task_struct *tsk)
127-
{
128-
struct cpu_context *ctx =
129-
&(((struct thread_info *)(tsk->stack))->cpu_context);
130-
131-
/* Check whether the thread is blocked in resume() */
132-
if (in_sched_functions(ctx->r15))
133-
return (unsigned long)ctx->r15;
134-
else
135-
return ctx->r14;
136-
}
137-
#endif
138-
139122
unsigned long get_wchan(struct task_struct *p)
140123
{
141124
/* TBD (used by procfs) */

‎arch/mips/kvm/tlb.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ static int _kvm_mips_host_tlb_inv(unsigned long entryhi)
166166
int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va,
167167
bool user, bool kernel)
168168
{
169-
int idx_user, idx_kernel;
169+
/*
170+
* Initialize idx_user and idx_kernel to workaround bogus
171+
* maybe-initialized warning when using GCC 6.
172+
*/
173+
int idx_user = 0, idx_kernel = 0;
170174
unsigned long flags, old_entryhi;
171175

172176
local_irq_save(flags);

0 commit comments

Comments
 (0)