Skip to content

Commit eb14f01

Browse files
davem330davem330
committed
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/e1000e/ich8lan.c
2 parents 9a4a842 + a3dd154 commit eb14f01

File tree

197 files changed

+3729
-2520
lines changed

Some content is hidden

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

197 files changed

+3729
-2520
lines changed

‎Documentation/arm/mem_alignment

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user
2424
space, and might cause programs to fail unexpectedly.
2525

2626
To change the alignment trap behavior, simply echo a number into
27-
/proc/sys/debug/alignment. The number is made up from various bits:
27+
/proc/cpu/alignment. The number is made up from various bits:
2828

2929
bit behavior when set
3030
--- -----------------

‎Documentation/local_ops.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
149149
int cpu;
150150

151151
/* Increment the counters */
152-
on_each_cpu(test_each, NULL, 0, 1);
152+
on_each_cpu(test_each, NULL, 1);
153153
/* Read all the counters */
154154
printk("Counters read from CPU %d\n", smp_processor_id());
155155
for_each_online_cpu(cpu) {

‎MAINTAINERS

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,10 +1527,10 @@ W: http://ebtables.sourceforge.net/
15271527
S: Maintained
15281528

15291529
ECRYPT FILE SYSTEM
1530-
P: Mike Halcrow, Phillip Hellewell
1531-
M: mhalcrow@us.ibm.com, [email protected]
1532-
L: ecryptfs-devel@lists.sourceforge.net
1533-
W: http://ecryptfs.sourceforge.net/
1530+
P: Tyler Hicks, Dustin Kirkland
1531+
M: [email protected].ibm.com, [email protected]
1532+
L: ecryptfs-devel@lists.launchpad.net
1533+
W: https://launchpad.net/ecryptfs
15341534
S: Supported
15351535

15361536
EDAC-CORE
@@ -3764,6 +3764,15 @@ M: [email protected]
37643764
L: [email protected]
37653765
S: Maintained
37663766

3767+
SECURITY SUBSYSTEM
3768+
F: security/
3769+
P: James Morris
3770+
M: [email protected]
3771+
L: [email protected]
3772+
L: [email protected] (suggested Cc:)
3773+
T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
3774+
S: Supported
3775+
37673776
SECURITY CONTACT
37683777
P: Security Officers
37693778
M: [email protected]

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 2
22
PATCHLEVEL = 6
33
SUBLEVEL = 28
4-
EXTRAVERSION = -rc7
4+
EXTRAVERSION = -rc8
55
NAME = Erotic Pickled Herring
66

77
# *DOCUMENTATION*

‎arch/arm/common/sa1111.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
630630
return -ENOMEM;
631631

632632
sachip->clk = clk_get(me, "SA1111_CLK");
633-
if (!sachip->clk) {
633+
if (IS_ERR(sachip->clk)) {
634634
ret = PTR_ERR(sachip->clk);
635635
goto err_free;
636636
}

‎arch/arm/include/asm/bitops.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
237237
#if __LINUX_ARM_ARCH__ < 5
238238

239239
#include <asm-generic/bitops/ffz.h>
240+
#include <asm-generic/bitops/__fls.h>
240241
#include <asm-generic/bitops/__ffs.h>
241242
#include <asm-generic/bitops/fls.h>
242243
#include <asm-generic/bitops/ffs.h>
@@ -277,16 +278,19 @@ static inline int constant_fls(int x)
277278
* the clz instruction for much better code efficiency.
278279
*/
279280

280-
#define __fls(x) \
281-
( __builtin_constant_p(x) ? constant_fls(x) : \
282-
({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
283-
284-
/* Implement fls() in C so that 64-bit args are suitably truncated */
285281
static inline int fls(int x)
286282
{
287-
return __fls(x);
283+
int ret;
284+
285+
if (__builtin_constant_p(x))
286+
return constant_fls(x);
287+
288+
asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");
289+
ret = 32 - ret;
290+
return ret;
288291
}
289292

293+
#define __fls(x) (fls(x) - 1)
290294
#define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
291295
#define __ffs(x) (ffs(x) - 1)
292296
#define ffz(x) __ffs( ~(x) )

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <asm/types.h>
2424

2525
#ifdef __KERNEL__
26-
#define STACK_TOP ((current->personality == PER_LINUX_32BIT) ? \
26+
#define STACK_TOP ((current->personality & ADDR_LIMIT_32BIT) ? \
2727
TASK_SIZE : TASK_SIZE_26)
2828
#define STACK_TOP_MAX TASK_SIZE
2929
#endif

‎arch/arm/kernel/armksyms.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ EXPORT_SYMBOL(__strnlen_user);
115115
EXPORT_SYMBOL(__strncpy_from_user);
116116

117117
#ifdef CONFIG_MMU
118+
EXPORT_SYMBOL(copy_page);
119+
118120
EXPORT_SYMBOL(__copy_from_user);
119121
EXPORT_SYMBOL(__copy_to_user);
120122
EXPORT_SYMBOL(__clear_user);
@@ -181,8 +183,6 @@ EXPORT_SYMBOL(_find_first_bit_be);
181183
EXPORT_SYMBOL(_find_next_bit_be);
182184
#endif
183185

184-
EXPORT_SYMBOL(copy_page);
185-
186186
#ifdef CONFIG_FUNCTION_TRACER
187187
EXPORT_SYMBOL(mcount);
188188
#endif

‎arch/arm/kernel/traps.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/personality.h>
1919
#include <linux/kallsyms.h>
2020
#include <linux/delay.h>
21+
#include <linux/hardirq.h>
2122
#include <linux/init.h>
2223
#include <linux/uaccess.h>
2324

‎arch/arm/mach-omap1/io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void __init omap1_map_common_io(void)
128128
* Common low-level hardware init for omap1. This should only get called from
129129
* board specific init.
130130
*/
131-
void __init omap1_init_common_hw()
131+
void __init omap1_init_common_hw(void)
132132
{
133133
/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
134134
* on a Posted Write in the TIPB Bridge".

‎arch/arm/mach-pxa/include/mach/reset.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask);
1212

1313
/**
1414
* init_gpio_reset() - register GPIO as reset generator
15-
*
16-
* @gpio - gpio nr
17-
* @output - set gpio as out/low instead of input during normal work
15+
* @gpio: gpio nr
16+
* @output: set gpio as out/low instead of input during normal work
1817
*/
1918
extern int init_gpio_reset(int gpio, int output);
2019

‎arch/arm/mm/alignment.c

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ static unsigned long ai_dword;
7070
static unsigned long ai_multi;
7171
static int ai_usermode;
7272

73+
#define UM_WARN (1 << 0)
74+
#define UM_FIXUP (1 << 1)
75+
#define UM_SIGNAL (1 << 2)
76+
7377
#ifdef CONFIG_PROC_FS
7478
static const char *usermode_action[] = {
7579
"ignored",
@@ -754,18 +758,18 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
754758
user:
755759
ai_user += 1;
756760

757-
if (ai_usermode & 1)
761+
if (ai_usermode & UM_WARN)
758762
printk("Alignment trap: %s (%d) PC=0x%08lx Instr=0x%0*lx "
759763
"Address=0x%08lx FSR 0x%03x\n", current->comm,
760764
task_pid_nr(current), instrptr,
761765
thumb_mode(regs) ? 4 : 8,
762766
thumb_mode(regs) ? tinstr : instr,
763767
addr, fsr);
764768

765-
if (ai_usermode & 2)
769+
if (ai_usermode & UM_FIXUP)
766770
goto fixup;
767771

768-
if (ai_usermode & 4)
772+
if (ai_usermode & UM_SIGNAL)
769773
force_sig(SIGBUS, current);
770774
else
771775
set_cr(cr_no_alignment);
@@ -796,6 +800,22 @@ static int __init alignment_init(void)
796800
res->write_proc = proc_alignment_write;
797801
#endif
798802

803+
/*
804+
* ARMv6 and later CPUs can perform unaligned accesses for
805+
* most single load and store instructions up to word size.
806+
* LDM, STM, LDRD and STRD still need to be handled.
807+
*
808+
* Ignoring the alignment fault is not an option on these
809+
* CPUs since we spin re-faulting the instruction without
810+
* making any progress.
811+
*/
812+
if (cpu_architecture() >= CPU_ARCH_ARMv6 && (cr_alignment & CR_U)) {
813+
cr_alignment &= ~CR_A;
814+
cr_no_alignment &= ~CR_A;
815+
set_cr(cr_alignment);
816+
ai_usermode = UM_FIXUP;
817+
}
818+
799819
hook_fault_code(1, do_alignment, SIGILL, "alignment exception");
800820
hook_fault_code(3, do_alignment, SIGILL, "alignment exception");
801821

‎arch/arm/mm/fault.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/module.h>
1212
#include <linux/signal.h>
1313
#include <linux/mm.h>
14+
#include <linux/hardirq.h>
1415
#include <linux/init.h>
1516
#include <linux/kprobes.h>
1617
#include <linux/uaccess.h>

‎arch/arm/plat-omap/include/mach/omapfb.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ struct omapfb_device {
353353
u32 pseudo_palette[17];
354354

355355
struct lcd_panel *panel; /* LCD panel */
356-
struct lcd_ctrl *ctrl; /* LCD controller */
357-
struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */
356+
const struct lcd_ctrl *ctrl; /* LCD controller */
357+
const struct lcd_ctrl *int_ctrl; /* internal LCD ctrl */
358358
struct lcd_ctrl_extif *ext_if; /* LCD ctrl external
359359
interface */
360360
struct device *dev;

‎arch/arm/plat-omap/sram.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
255255
if (!_omap_sram_reprogram_clock)
256256
omap_sram_error();
257257

258-
return _omap_sram_reprogram_clock(dpllctl, ckctl);
258+
_omap_sram_reprogram_clock(dpllctl, ckctl);
259259
}
260260

261261
int __init omap1_sram_init(void)
@@ -282,8 +282,8 @@ void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,
282282
if (!_omap2_sram_ddr_init)
283283
omap_sram_error();
284284

285-
return _omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
286-
base_cs, force_unlock);
285+
_omap2_sram_ddr_init(slow_dll_ctrl, fast_dll_ctrl,
286+
base_cs, force_unlock);
287287
}
288288

289289
static void (*_omap2_sram_reprogram_sdrc)(u32 perf_level, u32 dll_val,
@@ -294,7 +294,7 @@ void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, u32 mem_type)
294294
if (!_omap2_sram_reprogram_sdrc)
295295
omap_sram_error();
296296

297-
return _omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
297+
_omap2_sram_reprogram_sdrc(perf_level, dll_val, mem_type);
298298
}
299299

300300
static u32 (*_omap2_set_prcm)(u32 dpll_ctrl_val, u32 sdrc_rfr_val, int bypass);

‎arch/arm/plat-orion/pcie.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#define PCIE_CONF_REG(r) ((((r) & 0xf00) << 16) | ((r) & 0xfc))
3636
#define PCIE_CONF_BUS(b) (((b) & 0xff) << 16)
3737
#define PCIE_CONF_DEV(d) (((d) & 0x1f) << 11)
38-
#define PCIE_CONF_FUNC(f) (((f) & 0x3) << 8)
38+
#define PCIE_CONF_FUNC(f) (((f) & 0x7) << 8)
3939
#define PCIE_CONF_DATA_OFF 0x18fc
4040
#define PCIE_MASK_OFF 0x1910
4141
#define PCIE_CTRL_OFF 0x1a00

0 commit comments

Comments
 (0)