Skip to content

Commit 3b38f31

Browse files
linvjwlinvjw
committed
Merge branch 'from-linus' into upstream
2 parents 5d25ea7 + 353b28b commit 3b38f31

File tree

170 files changed

+3232
-1295
lines changed

Some content is hidden

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

170 files changed

+3232
-1295
lines changed

‎Documentation/dvb/get_dvb_firmware

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,18 +259,18 @@ sub dibusb {
259259
}
260260

261261
sub nxt2002 {
262-
my $sourcefile = "Broadband4PC_4_2_11.zip";
262+
my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";
263263
my $url = "http://www.bbti.us/download/windows/$sourcefile";
264-
my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";
264+
my $hash = "476befae8c7c1bb9648954060b1eec1f";
265265
my $outfile = "dvb-fe-nxt2002.fw";
266266
my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
267267

268268
checkstandard();
269269

270270
wgetfile($sourcefile, $url);
271271
unzip($sourcefile, $tmpdir);
272-
verify("$tmpdir/SkyNETU.sys", $hash);
273-
extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);
272+
verify("$tmpdir/SkyNET.sys", $hash);
273+
extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);
274274

275275
$outfile;
276276
}

‎Documentation/feature-removal-schedule.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ Who: Jody McIntyre <[email protected]>
5757

5858
---------------------------
5959

60+
What: sbp2: module parameter "force_inquiry_hack"
61+
When: July 2006
62+
Why: Superceded by parameter "workarounds". Both parameters are meant to be
63+
used ad-hoc and for single devices only, i.e. not in modprobe.conf,
64+
therefore the impact of this feature replacement should be low.
65+
Who: Stefan Richter <[email protected]>
66+
67+
---------------------------
68+
6069
What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
6170
When: July 2006
6271
Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6

‎Documentation/firmware_class/README

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,3 @@
105105
on the setup, so I think that the choice on what firmware to make
106106
persistent should be left to userspace.
107107

108-
- Why register_firmware()+__init can be useful:
109-
- For boot devices needing firmware.
110-
- To make the transition easier:
111-
The firmware can be declared __init and register_firmware()
112-
called on module_init. Then the firmware is warranted to be
113-
there even if "firmware hotplug userspace" is not there yet or
114-
it doesn't yet provide the needed firmware.
115-
Once the firmware is widely available in userspace, it can be
116-
removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).
117-
118-
In either case, if firmware hotplug support is there, it can move the
119-
firmware out of kernel memory into the real filesystem for later
120-
usage.
121-
122-
Note: If persistence is implemented on top of initramfs,
123-
register_firmware() may not be appropriate.
124-

‎Documentation/firmware_class/firmware_sample_driver.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*
66
* Sample code on how to use request_firmware() from drivers.
77
*
8-
* Note that register_firmware() is currently useless.
9-
*
108
*/
119

1210
#include <linux/module.h>
@@ -17,11 +15,6 @@
1715

1816
#include "linux/firmware.h"
1917

20-
#define WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
21-
#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
22-
char __init inkernel_firmware[] = "let's say that this is firmware\n";
23-
#endif
24-
2518
static struct device ghost_device = {
2619
.bus_id = "ghost0",
2720
};
@@ -104,10 +97,6 @@ static void sample_probe_async(void)
10497

10598
static int sample_init(void)
10699
{
107-
#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
108-
register_firmware("sample_driver_fw", inkernel_firmware,
109-
sizeof(inkernel_firmware));
110-
#endif
111100
device_initialize(&ghost_device);
112101
/* since there is no real hardware insertion I just call the
113102
* sample probe functions here */

‎Documentation/watchdog/watchdog-api.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ timeout or margin. The simplest way to ping the watchdog is to write
3636
some data to the device. So a very simple watchdog daemon would look
3737
like this:
3838

39+
#include <stdlib.h>
40+
#include <fcntl.h>
41+
3942
int main(int argc, const char *argv[]) {
4043
int fd=open("/dev/watchdog",O_WRONLY);
4144
if (fd==-1) {

‎MAINTAINERS

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,20 @@ trivial patch so apply some common sense.
4040
PLEASE document known bugs. If it doesn't work for everything
4141
or does something very odd once a month document it.
4242

43+
PLEASE remember that submissions must be made under the terms
44+
of the OSDL certificate of contribution
45+
(http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html)
46+
and should include a Signed-off-by: line.
47+
4348
6. Make sure you have the right to send any changes you make. If you
4449
do changes at work you may find your employer owns the patch
4550
not you.
4651

47-
7. Happy hacking.
52+
7. When sending security related changes or reports to a maintainer
53+
please Cc: [email protected], especially if the maintainer
54+
does not respond.
55+
56+
8. Happy hacking.
4857

4958
-----------------------------------
5059

@@ -969,7 +978,7 @@ S: Maintained
969978
EXT3 FILE SYSTEM
970979
P: Stephen Tweedie, Andrew Morton
971980
M: [email protected], [email protected], [email protected]
972-
L: [email protected]
981+
L: [email protected]
973982
S: Maintained
974983

975984
F71805F HARDWARE MONITORING DRIVER
@@ -1530,12 +1539,28 @@ W: http://jfs.sourceforge.net/
15301539
T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
15311540
S: Supported
15321541

1542+
JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
1543+
P: Stephen Tweedie, Andrew Morton
1544+
M: [email protected], [email protected]
1545+
L: [email protected]
1546+
S: Maintained
1547+
15331548
KCONFIG
15341549
P: Roman Zippel
15351550
M: [email protected]
15361551
L: [email protected]
15371552
S: Maintained
15381553

1554+
KDUMP
1555+
P: Vivek Goyal
1556+
M: [email protected]
1557+
P: Haren Myneni
1558+
M: [email protected]
1559+
L: [email protected]
1560+
L: [email protected]
1561+
W: http://lse.sourceforge.net/kdump/
1562+
S: Maintained
1563+
15391564
KERNEL AUTOMOUNTER (AUTOFS)
15401565
P: H. Peter Anvin
15411566
M: [email protected]

‎arch/arm/mach-pxa/mainstone.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ static void __init mainstone_init_irq(void)
9595
for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) {
9696
set_irq_chip(irq, &mainstone_irq_chip);
9797
set_irq_handler(irq, do_level_IRQ);
98-
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
98+
if (irq == MAINSTONE_IRQ(10) || irq == MAINSTONE_IRQ(14))
99+
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN);
100+
else
101+
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
99102
}
100103
set_irq_flags(MAINSTONE_IRQ(8), 0);
101104
set_irq_flags(MAINSTONE_IRQ(12), 0);

‎arch/arm/mach-s3c2410/sleep.S

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ ENTRY(s3c2410_cpu_suspend)
5959
mrc p15, 0, r5, c13, c0, 0 @ PID
6060
mrc p15, 0, r6, c3, c0, 0 @ Domain ID
6161
mrc p15, 0, r7, c2, c0, 0 @ translation table base address
62-
mrc p15, 0, r8, c2, c0, 0 @ auxiliary control register
63-
mrc p15, 0, r9, c1, c0, 0 @ control register
62+
mrc p15, 0, r8, c1, c0, 0 @ control register
6463

6564
stmia r0, { r4 - r13 }
6665

@@ -165,15 +164,14 @@ ENTRY(s3c2410_cpu_resume)
165164
mcr p15, 0, r5, c13, c0, 0 @ PID
166165
mcr p15, 0, r6, c3, c0, 0 @ Domain ID
167166
mcr p15, 0, r7, c2, c0, 0 @ translation table base
168-
mcr p15, 0, r8, c1, c1, 0 @ auxilliary control
169167

170168
#ifdef CONFIG_DEBUG_RESUME
171169
mov r3, #'R'
172170
strb r3, [ r2, #S3C2410_UTXH ]
173171
#endif
174172

175173
ldr r2, =resume_with_mmu
176-
mcr p15, 0, r9, c1, c0, 0 @ turn on MMU, etc
174+
mcr p15, 0, r8, c1, c0, 0 @ turn on MMU, etc
177175
nop @ second-to-last before mmu
178176
mov pc, r2 @ go back to virtual address
179177

‎arch/i386/kernel/apic.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,6 +1341,14 @@ int __init APIC_init_uniprocessor (void)
13411341

13421342
connect_bsp_APIC();
13431343

1344+
/*
1345+
* Hack: In case of kdump, after a crash, kernel might be booting
1346+
* on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
1347+
* might be zero if read from MP tables. Get it from LAPIC.
1348+
*/
1349+
#ifdef CONFIG_CRASH_DUMP
1350+
boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
1351+
#endif
13441352
phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);
13451353

13461354
setup_local_APIC();

‎arch/i386/kernel/traps.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,8 @@ static inline int print_addr_and_symbol(unsigned long addr, char *log_lvl,
130130
print_symbol("%s", addr);
131131

132132
printed = (printed + 1) % CONFIG_STACK_BACKTRACE_COLS;
133-
134133
if (printed)
135-
printk(" ");
134+
printk(" ");
136135
else
137136
printk("\n");
138137

@@ -212,7 +211,6 @@ static void show_stack_log_lvl(struct task_struct *task, unsigned long *esp,
212211
}
213212

214213
stack = esp;
215-
printk(log_lvl);
216214
for(i = 0; i < kstack_depth_to_print; i++) {
217215
if (kstack_end(stack))
218216
break;

‎arch/i386/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ void __init mem_init(void)
651651
* Specifically, in the case of x86, we will always add
652652
* memory to the highmem for now.
653653
*/
654-
#ifdef CONFIG_HOTPLUG_MEMORY
654+
#ifdef CONFIG_MEMORY_HOTPLUG
655655
#ifndef CONFIG_NEED_MULTIPLE_NODES
656656
int add_memory(u64 start, u64 size)
657657
{

‎arch/ia64/configs/sn2_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
134134
CONFIG_ARCH_SPARSEMEM_ENABLE=y
135135
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
136136
CONFIG_NUMA=y
137-
CONFIG_NODES_SHIFT=8
137+
CONFIG_NODES_SHIFT=10
138138
CONFIG_VIRTUAL_MEM_MAP=y
139139
CONFIG_HOLES_IN_ZONE=y
140140
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
@@ -1159,7 +1159,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
11591159
# CONFIG_SCHEDSTATS is not set
11601160
# CONFIG_DEBUG_SLAB is not set
11611161
CONFIG_DEBUG_PREEMPT=y
1162-
CONFIG_DEBUG_MUTEXES=y
1162+
# CONFIG_DEBUG_MUTEXES is not set
11631163
# CONFIG_DEBUG_SPINLOCK is not set
11641164
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
11651165
# CONFIG_DEBUG_KOBJECT is not set

‎arch/ia64/kernel/iosapic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq)
416416
ia64_vector vec = irq_to_vector(irq);
417417
struct iosapic_rte_info *rte;
418418

419-
move_irq(irq);
419+
move_native_irq(irq);
420420
list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list)
421421
iosapic_eoi(rte->addr, vec);
422422
}
@@ -458,7 +458,7 @@ iosapic_ack_edge_irq (unsigned int irq)
458458
{
459459
irq_desc_t *idesc = irq_descp(irq);
460460

461-
move_irq(irq);
461+
move_native_irq(irq);
462462
/*
463463
* Once we have recorded IRQ_PENDING already, we can mask the
464464
* interrupt for real. This prevents IRQ storms from unhandled

‎arch/ia64/kernel/irq.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
101101

102102
if (irq < NR_IRQS) {
103103
irq_affinity[irq] = mask;
104-
set_irq_info(irq, mask);
105104
irq_redir[irq] = (char) (redir & 0xff);
106105
}
107106
}

‎arch/s390/kernel/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void)
272272
next = next_timer_interrupt();
273273
do {
274274
seq = read_seqbegin_irqsave(&xtime_lock, flags);
275-
timer = (__u64)(next - jiffies) + jiffies_64;
275+
timer = (__u64 next) - (__u64 jiffies) + jiffies_64;
276276
} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
277277
todval = -1ULL;
278278
/* Be careful about overflows. */

‎arch/sparc/kernel/systbls.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ sys_call_table:
7979
/*285*/ .long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64
8080
/*290*/ .long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
8181
/*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare
82+
/*300*/ .long sys_set_robust_list, sys_get_robust_list
8283

8384
#ifdef CONFIG_SUNOS_EMUL
8485
/* Now the SunOS syscall table. */
@@ -190,6 +191,6 @@ sunos_sys_table:
190191
/*290*/ .long sunos_nosys, sunos_nosys, sunos_nosys
191192
.long sunos_nosys, sunos_nosys, sunos_nosys
192193
.long sunos_nosys, sunos_nosys, sunos_nosys
193-
.long sunos_nosys
194+
.long sunos_nosys, sunos_nosys, sunos_nosys
194195

195196
#endif

‎arch/sparc64/kernel/systbls.S

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ sys_call_table32:
7878
.word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid
7979
/*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat
8080
.word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64
81-
/*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
81+
/*290*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
8282
.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare
83+
/*300*/ .word compat_sys_set_robust_list, compat_sys_get_robust_list
8384

8485
#endif /* CONFIG_COMPAT */
8586

@@ -147,8 +148,9 @@ sys_call_table:
147148
.word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
148149
/*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
149150
.word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64
150-
/*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
151+
/*290*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
151152
.word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare
153+
/*300*/ .word sys_set_robust_list, sys_get_robust_list
152154

153155
#if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
154156
defined(CONFIG_SOLARIS_EMUL_MODULE)
@@ -261,5 +263,5 @@ sunos_sys_table:
261263
/*290*/ .word sunos_nosys, sunos_nosys, sunos_nosys
262264
.word sunos_nosys, sunos_nosys, sunos_nosys
263265
.word sunos_nosys, sunos_nosys, sunos_nosys
264-
.word sunos_nosys
266+
.word sunos_nosys, sunos_nosys, sunos_nosys
265267
#endif

‎arch/x86_64/kernel/kprobes.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,13 +514,13 @@ static void __kprobes resume_execution(struct kprobe *p,
514514
*tos = orig_rip + (*tos - copy_rip);
515515
break;
516516
case 0xff:
517-
if ((*insn & 0x30) == 0x10) {
517+
if ((insn[1] & 0x30) == 0x10) {
518518
/* call absolute, indirect */
519519
/* Fix return addr; rip is correct. */
520520
next_rip = regs->rip;
521521
*tos = orig_rip + (*tos - copy_rip);
522-
} else if (((*insn & 0x31) == 0x20) || /* jmp near, absolute indirect */
523-
((*insn & 0x31) == 0x21)) { /* jmp far, absolute indirect */
522+
} else if (((insn[1] & 0x31) == 0x20) || /* jmp near, absolute indirect */
523+
((insn[1] & 0x31) == 0x21)) { /* jmp far, absolute indirect */
524524
/* rip is correct. */
525525
next_rip = regs->rip;
526526
}

0 commit comments

Comments
 (0)