Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211371
b: refs/heads/master
c: 6715981
h: refs/heads/master
i:
  211369: 7951e8b
  211367: c13ffe5
v: v3
  • Loading branch information
Naoya Horiguchi authored and Andi Kleen committed Oct 7, 2010
1 parent a1142c6 commit 47fee8f
Show file tree
Hide file tree
Showing 146 changed files with 509 additions and 863 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c8d86d8ac439ef6c9364bf0ba3a05a3f9a8e0dea
refs/heads/master: 67159813127309c1a65d86e40fa0368241fa668c
2 changes: 1 addition & 1 deletion trunk/Documentation/vm/page-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void)
}

if (opt_unpoison && !hwpoison_forget_fd) {
sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs);
sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs);
hwpoison_forget_fd = checked_open(buf, O_WRONLY);
}
}
Expand Down
12 changes: 1 addition & 11 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -969,16 +969,6 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
S: Maintained
F: arch/arm/mach-s5p*/

ARM/SAMSUNG S5P SERIES FIMC SUPPORT
M: Kyungmin Park <kyungmin.park@samsung.com>
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-arm-kernel@lists.infradead.org
L: linux-media@vger.kernel.org
S: Maintained
F: arch/arm/plat-s5p/dev-fimc*
F: arch/arm/plat-samsung/include/plat/*fimc*
F: drivers/media/video/s5p-fimc/

ARM/SHMOBILE ARM ARCHITECTURE
M: Paul Mundt <lethal@linux-sh.org>
M: Magnus Damm <magnus.damm@gmail.com>
Expand Down Expand Up @@ -2545,7 +2535,7 @@ S: Supported
F: drivers/scsi/gdt*

GENERIC GPIO I2C DRIVER
M: Haavard Skinnemoen <hskinnemoen@gmail.com>
M: Haavard Skinnemoen <hskinnemoen@atmel.com>
S: Supported
F: drivers/i2c/busses/i2c-gpio.c
F: include/linux/i2c-gpio.h
Expand Down
2 changes: 1 addition & 1 deletion trunk/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 36
EXTRAVERSION = -rc7
EXTRAVERSION = -rc6
NAME = Sheep on Meth

# *DOCUMENTATION*
Expand Down
7 changes: 2 additions & 5 deletions trunk/arch/arm/oprofile/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ static int op_create_counter(int cpu, int event)
if (IS_ERR(pevent)) {
ret = PTR_ERR(pevent);
} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
perf_event_release_kernel(pevent);
pr_warning("oprofile: failed to enable event %d "
"on CPU %d\n", event, cpu);
ret = -EBUSY;
Expand Down Expand Up @@ -366,7 +365,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
ret = init_driverfs();
if (ret) {
kfree(counter_config);
counter_config = NULL;
return ret;
}

Expand Down Expand Up @@ -404,6 +402,7 @@ void oprofile_arch_exit(void)
struct perf_event *event;

if (*perf_events) {
exit_driverfs();
for_each_possible_cpu(cpu) {
for (id = 0; id < perf_num_counters; ++id) {
event = perf_events[cpu][id];
Expand All @@ -414,10 +413,8 @@ void oprofile_arch_exit(void)
}
}

if (counter_config) {
if (counter_config)
kfree(counter_config);
exit_driverfs();
}
}
#else
int __init oprofile_arch_init(struct oprofile_operations *ops)
Expand Down
3 changes: 2 additions & 1 deletion trunk/arch/avr32/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,10 @@ int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
vfree(module->arch.syminfo);
module->arch.syminfo = NULL;

return 0;
return module_bug_finalize(hdr, sechdrs, module);
}

void module_arch_cleanup(struct module *module)
{
module_bug_cleanup(module);
}
3 changes: 2 additions & 1 deletion trunk/arch/h8300/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
struct module *me)
{
return 0;
return module_bug_finalize(hdr, sechdrs, me);
}

void module_arch_cleanup(struct module *mod)
{
module_bug_cleanup(mod);
}
21 changes: 2 additions & 19 deletions trunk/arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ config MIPS
select HAVE_KPROBES
select HAVE_KRETPROBES
select RTC_LIB if !MACH_LOONGSON
select GENERIC_ATOMIC64 if !64BIT

mainmenu "Linux/MIPS Kernel Configuration"

Expand Down Expand Up @@ -1647,16 +1646,8 @@ config MIPS_MT_SMP
select SYS_SUPPORTS_SMP
select SMP_UP
help
This is a kernel model which is known a VSMP but lately has been
marketesed into SMVP.
Virtual SMP uses the processor's VPEs to implement virtual
processors. In currently available configuration of the 34K processor
this allows for a dual processor. Both processors will share the same
primary caches; each will obtain the half of the TLB for it's own
exclusive use. For a layman this model can be described as similar to
what Intel calls Hyperthreading.

For further information see http://www.linux-mips.org/wiki/34K#VSMP
This is a kernel model which is also known a VSMP or lately
has been marketesed into SMVP.

config MIPS_MT_SMTC
bool "SMTC: Use all TCs on all VPEs for SMP"
Expand All @@ -1673,14 +1664,6 @@ config MIPS_MT_SMTC
help
This is a kernel model which is known a SMTC or lately has been
marketesed into SMVP.
is presenting the available TC's of the core as processors to Linux.
On currently available 34K processors this means a Linux system will
see up to 5 processors. The implementation of the SMTC kernel differs
significantly from VSMP and cannot efficiently coexist in the same
kernel binary so the choice between VSMP and SMTC is a compile time
decision.

For further information see http://www.linux-mips.org/wiki/34K#SMTC

endchoice

Expand Down
5 changes: 3 additions & 2 deletions trunk/arch/mips/alchemy/common/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int prom_argc;
char **prom_argv;
char **prom_envp;

void __init prom_init_cmdline(void)
void prom_init_cmdline(void)
{
int i;

Expand Down Expand Up @@ -104,7 +104,7 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
}
}

int __init prom_get_ethernet_addr(char *ethernet_addr)
int prom_get_ethernet_addr(char *ethernet_addr)
{
char *ethaddr_str;

Expand All @@ -123,6 +123,7 @@ int __init prom_get_ethernet_addr(char *ethernet_addr)

return 0;
}
EXPORT_SYMBOL(prom_get_ethernet_addr);

void __init prom_free_prom_memory(void)
{
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ $(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE
hostprogs-y := calc_vmlinuz_load_addr

VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
$(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
$(objtree)/$(KBUILD_IMAGE) $(VMLINUX_LOAD_ADDRESS))

vmlinuzobjs-y += $(obj)/piggy.o

Expand Down
4 changes: 0 additions & 4 deletions trunk/arch/mips/cavium-octeon/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,3 @@ config ARCH_SPARSEMEM_ENABLE
def_bool y
select SPARSEMEM_STATIC
depends on CPU_CAVIUM_OCTEON

config CAVIUM_OCTEON_HELPER
def_bool y
depends on OCTEON_ETHERNET || PCI
2 changes: 1 addition & 1 deletion trunk/arch/mips/cavium-octeon/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static int cnmips_cu2_call(struct notifier_block *nfb, unsigned long action,
return NOTIFY_OK; /* Let default notifier send signals */
}

static int __init cnmips_cu2_setup(void)
static int cnmips_cu2_setup(void)
{
return cu2_notifier(cnmips_cu2_call, 0);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/cavium-octeon/executive/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@

obj-y += cvmx-bootmem.o cvmx-l2c.o cvmx-sysinfo.o octeon-model.o

obj-$(CONFIG_CAVIUM_OCTEON_HELPER) += cvmx-helper-errata.o cvmx-helper-jtag.o
obj-$(CONFIG_PCI) += cvmx-helper-errata.o cvmx-helper-jtag.o
4 changes: 0 additions & 4 deletions trunk/arch/mips/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -782,10 +782,6 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
*/
#define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)

#else /* !CONFIG_64BIT */

#include <asm-generic/atomic64.h>

#endif /* CONFIG_64BIT */

/*
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/include/asm/cop2.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern int cu2_notifier_call_chain(unsigned long val, void *v);

#define cu2_notifier(fn, pri) \
({ \
static struct notifier_block fn##_nb = { \
static struct notifier_block fn##_nb __cpuinitdata = { \
.notifier_call = fn, \
.priority = pri \
}; \
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/mips/include/asm/gic.h
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ struct gic_intrmask_regs {
*/
struct gic_intr_map {
unsigned int cpunum; /* Directed to this CPU */
#define GIC_UNUSED 0xdead /* Dummy data */
unsigned int pin; /* Directed to this Pin */
unsigned int polarity; /* Polarity : +/- */
unsigned int trigtype; /* Trigger : Edge/Levl */
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/include/asm/mach-tx49xx/kmalloc.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef __ASM_MACH_TX49XX_KMALLOC_H
#define __ASM_MACH_TX49XX_KMALLOC_H

#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
#define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES

#endif /* __ASM_MACH_TX49XX_KMALLOC_H */
3 changes: 3 additions & 0 deletions trunk/arch/mips/include/asm/mips-boards/maltaint.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@

#define GIC_EXT_INTR(x) x

/* Dummy data */
#define X 0xdead

/* External Interrupts used for IPI */
#define GIC_IPI_EXT_INTR_RESCHED_VPE0 16
#define GIC_IPI_EXT_INTR_CALLFNC_VPE0 17
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/mips/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
#endif
#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))

/*
* RELOC_HIDE was originally added by 6007b903dfe5f1d13e0c711ac2894bdd4a61b1ad
* (lmo) rsp. 8431fd094d625b94d364fe393076ccef88e6ce18 (kernel.org). The
* discussion can be found in lkml posting
* <a2ebde260608230500o3407b108hc03debb9da6e62c@mail.gmail.com> which is
* archived at http://lists.linuxcoding.com/kernel/2006-q3/msg17360.html
*
* It is unclear if the misscompilations mentioned in
* http://lkml.org/lkml/2010/8/8/138 also affect MIPS so we keep this one
* until GCC 3.x has been retired before we can apply
* https://patchwork.linux-mips.org/patch/1541/
*/

#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))

#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/mips/include/asm/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ register struct thread_info *__current_thread_info __asm__("$28");
#define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)

/* work to do on interrupt/exception return */
#define _TIF_WORK_MASK (0x0000ffef & \
~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
#define _TIF_WORK_MASK (0x0000ffef & ~_TIF_SECCOMP)
/* work to do on any return to u-space */
#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)

Expand Down
21 changes: 6 additions & 15 deletions trunk/arch/mips/include/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -356,19 +356,16 @@
#define __NR_perf_event_open (__NR_Linux + 333)
#define __NR_accept4 (__NR_Linux + 334)
#define __NR_recvmmsg (__NR_Linux + 335)
#define __NR_fanotify_init (__NR_Linux + 336)
#define __NR_fanotify_mark (__NR_Linux + 337)
#define __NR_prlimit64 (__NR_Linux + 338)

/*
* Offset of the last Linux o32 flavoured syscall
*/
#define __NR_Linux_syscalls 338
#define __NR_Linux_syscalls 335

#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */

#define __NR_O32_Linux 4000
#define __NR_O32_Linux_syscalls 338
#define __NR_O32_Linux_syscalls 335

#if _MIPS_SIM == _MIPS_SIM_ABI64

Expand Down Expand Up @@ -671,19 +668,16 @@
#define __NR_perf_event_open (__NR_Linux + 292)
#define __NR_accept4 (__NR_Linux + 293)
#define __NR_recvmmsg (__NR_Linux + 294)
#define __NR_fanotify_init (__NR_Linux + 295)
#define __NR_fanotify_mark (__NR_Linux + 296)
#define __NR_prlimit64 (__NR_Linux + 297)

/*
* Offset of the last Linux 64-bit flavoured syscall
*/
#define __NR_Linux_syscalls 297
#define __NR_Linux_syscalls 294

#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */

#define __NR_64_Linux 5000
#define __NR_64_Linux_syscalls 297
#define __NR_64_Linux_syscalls 294

#if _MIPS_SIM == _MIPS_SIM_NABI32

Expand Down Expand Up @@ -991,19 +985,16 @@
#define __NR_accept4 (__NR_Linux + 297)
#define __NR_recvmmsg (__NR_Linux + 298)
#define __NR_getdents64 (__NR_Linux + 299)
#define __NR_fanotify_init (__NR_Linux + 300)
#define __NR_fanotify_mark (__NR_Linux + 301)
#define __NR_prlimit64 (__NR_Linux + 302)

/*
* Offset of the last N32 flavoured syscall
*/
#define __NR_Linux_syscalls 302
#define __NR_Linux_syscalls 299

#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */

#define __NR_N32_Linux 6000
#define __NR_N32_Linux_syscalls 302
#define __NR_N32_Linux_syscalls 299

#ifdef __KERNEL__

Expand Down
5 changes: 3 additions & 2 deletions trunk/arch/mips/kernel/irq-gic.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <asm/io.h>
#include <asm/gic.h>
#include <asm/gcmpregs.h>
#include <asm/mips-boards/maltaint.h>
#include <asm/irq.h>
#include <linux/hardirq.h>
#include <asm-generic/bitops/find.h>
Expand Down Expand Up @@ -130,7 +131,7 @@ static int gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
int i;

irq -= _irqbase;
pr_debug("%s(%d) called\n", __func__, irq);
pr_debug(KERN_DEBUG "%s(%d) called\n", __func__, irq);
cpumask_and(&tmp, cpumask, cpu_online_mask);
if (cpus_empty(tmp))
return -1;
Expand Down Expand Up @@ -221,7 +222,7 @@ static void __init gic_basic_init(int numintrs, int numvpes,
/* Setup specifics */
for (i = 0; i < mapsize; i++) {
cpu = intrmap[i].cpunum;
if (cpu == GIC_UNUSED)
if (cpu == X)
continue;
if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
continue;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/kernel/kgdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd,
struct pt_regs *regs = args->regs;
int trap = (regs->cp0_cause & 0x7c) >> 2;

/* Userspace events, ignore. */
/* Userpace events, ignore. */
if (user_mode(regs))
return NOTIFY_DONE;

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/kernel/kspd.c
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void sp_work_handle_request(void)
memset(&tz, 0, sizeof(tz));
if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
(int)&tz, 0, 0)) == 0)
ret.retval = tv.tv_sec;
ret.retval = tv.tv_sec;
break;

case MTSP_SYSCALL_EXIT:
Expand Down
Loading

0 comments on commit 47fee8f

Please sign in to comment.