From 5c64c36cf61370aa827bf0e284ffd22ca3ed877d Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 19 Jun 2007 12:41:32 +0900 Subject: [PATCH] --- yaml --- r: 57878 b: refs/heads/master c: e227e8f3ba3bfb8e26fee783026c1425ba600037 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 4 ++-- trunk/arch/s390/appldata/appldata_base.c | 5 +++-- trunk/arch/s390/kernel/entry.S | 8 +------- trunk/arch/s390/kernel/entry64.S | 8 +------- trunk/arch/s390/kernel/setup.c | 1 - trunk/arch/s390/kernel/traps.c | 9 +++------ trunk/arch/sh/kernel/signal.c | 9 +++------ trunk/arch/sh/kernel/traps.c | 3 --- trunk/arch/sh64/kernel/signal.c | 1 + trunk/drivers/s390/char/zcore.c | 3 --- trunk/fs/xfs/linux-2.6/xfs_lrw.c | 2 +- trunk/include/asm-s390/processor.h | 5 ----- trunk/include/asm-s390/ptrace.h | 9 ++++++++- trunk/sound/ppc/pmac.c | 8 +++----- 15 files changed, 27 insertions(+), 50 deletions(-) diff --git a/[refs] b/[refs] index a031ae47a3ac..7c626862deba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3197dac24f4f98808a47c68cdb8efeee8539add1 +refs/heads/master: e227e8f3ba3bfb8e26fee783026c1425ba600037 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4ce895a4b5ba..bef79776b388 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4022,11 +4022,11 @@ S: Supported XFS FILESYSTEM P: Silicon Graphics Inc -P: Tim Shimmin +P: Tim Shimmin, David Chatterton M: xfs-masters@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs -T: git git://oss.sgi.com:8090/xfs/xfs-2.6.git +T: git git://oss.sgi.com:8090/xfs/xfs-2.6 S: Supported XILINX UARTLITE SERIAL DRIVER diff --git a/trunk/arch/s390/appldata/appldata_base.c b/trunk/arch/s390/appldata/appldata_base.c index 6ffbab77ae4d..81a2b92ab0c2 100644 --- a/trunk/arch/s390/appldata/appldata_base.c +++ b/trunk/arch/s390/appldata/appldata_base.c @@ -535,7 +535,8 @@ void appldata_unregister_ops(struct appldata_ops *ops) /******************************* init / exit *********************************/ -static void __cpuinit appldata_online_cpu(int cpu) +static void +appldata_online_cpu(int cpu) { init_virt_timer(&per_cpu(appldata_timer, cpu)); per_cpu(appldata_timer, cpu).function = appldata_timer_function; @@ -579,7 +580,7 @@ appldata_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } -static struct notifier_block __cpuinitdata appldata_nb = { +static struct notifier_block appldata_nb = { .notifier_call = appldata_cpu_notify, }; diff --git a/trunk/arch/s390/kernel/entry.S b/trunk/arch/s390/kernel/entry.S index 6234c6978a1f..c8a2212014e0 100644 --- a/trunk/arch/s390/kernel/entry.S +++ b/trunk/arch/s390/kernel/entry.S @@ -769,13 +769,10 @@ mcck_return: RESTORE_ALL __LC_RETURN_MCCK_PSW,0 +#ifdef CONFIG_SMP /* * Restart interruption handler, kick starter for additional CPUs */ -#ifdef CONFIG_SMP -#ifndef CONFIG_HOTPLUG_CPU - .section .init.text,"ax" -#endif .globl restart_int_handler restart_int_handler: l %r15,__LC_SAVE_AREA+60 # load ksp @@ -788,9 +785,6 @@ restart_int_handler: br %r14 # branch to start_secondary restart_addr: .long start_secondary -#ifndef CONFIG_HOTPLUG_CPU - .previous -#endif #else /* * If we do not run with SMP enabled, let the new CPU crash ... diff --git a/trunk/arch/s390/kernel/entry64.S b/trunk/arch/s390/kernel/entry64.S index 685f11faa4bc..93745fd8f555 100644 --- a/trunk/arch/s390/kernel/entry64.S +++ b/trunk/arch/s390/kernel/entry64.S @@ -745,13 +745,10 @@ mcck_return: #endif lpswe __LC_RETURN_MCCK_PSW # back to caller +#ifdef CONFIG_SMP /* * Restart interruption handler, kick starter for additional CPUs */ -#ifdef CONFIG_SMP -#ifndef CONFIG_HOTPLUG_CPU - .section .init.text,"ax" -#endif .globl restart_int_handler restart_int_handler: lg %r15,__LC_SAVE_AREA+120 # load ksp @@ -762,9 +759,6 @@ restart_int_handler: lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on jg start_secondary -#ifndef CONFIG_HOTPLUG_CPU - .previous -#endif #else /* * If we do not run with SMP enabled, let the new CPU crash ... diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index 7e1bfb984064..51d6309e7f3b 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -300,7 +300,6 @@ static void __init setup_zfcpdump(unsigned int console_devno) else sprintf(str, "cio_ignore=all,!0.0.%04x", ipl_info.data.fcp.dev_id.devno); - strcat(COMMAND_LINE, " "); strcat(COMMAND_LINE, str); console_loglevel = 2; } diff --git a/trunk/arch/s390/kernel/traps.c b/trunk/arch/s390/kernel/traps.c index ee9186f8fb08..cbfe73034c30 100644 --- a/trunk/arch/s390/kernel/traps.c +++ b/trunk/arch/s390/kernel/traps.c @@ -253,22 +253,19 @@ void die(const char * str, struct pt_regs * regs, long err) { static int die_counter; - oops_enter(); debug_stop_all(); console_verbose(); spin_lock_irq(&die_lock); bust_spinlocks(1); printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter); - print_modules(); - show_regs(regs); + show_regs(regs); bust_spinlocks(0); - spin_unlock_irq(&die_lock); + spin_unlock_irq(&die_lock); if (in_interrupt()) panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception: panic_on_oops"); - oops_exit(); - do_exit(SIGSEGV); + do_exit(SIGSEGV); } static void inline diff --git a/trunk/arch/sh/kernel/signal.c b/trunk/arch/sh/kernel/signal.c index e323e299878b..b32c35a7c0a3 100644 --- a/trunk/arch/sh/kernel/signal.c +++ b/trunk/arch/sh/kernel/signal.c @@ -268,7 +268,7 @@ asmlinkage int sys_rt_sigreturn(unsigned long r4, unsigned long r5, badframe: force_sig(SIGSEGV, current); return 0; -} +} /* * Set up a signal frame. @@ -481,7 +481,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, static int handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, - sigset_t *oldset, struct pt_regs *regs, unsigned int save_r0) + sigset_t *oldset, struct pt_regs *regs) { int ret; @@ -489,7 +489,6 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, if (regs->tra >= 0) { /* If so, check system call restarting.. */ switch (regs->regs[0]) { - case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->regs[0] = -EINTR; break; @@ -501,7 +500,6 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, } /* fallthrough */ case -ERESTARTNOINTR: - regs->regs[0] = save_r0; regs->pc -= instruction_size( ctrl_inw(regs->pc - 4)); break; @@ -585,8 +583,7 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0) signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { /* Whee! Actually deliver the signal. */ - if (handle_signal(signr, &ka, &info, oldset, - regs, save_r0) == 0) { + if (handle_signal(signr, &ka, &info, oldset, regs) == 0) { /* a signal was successfully delivered; the saved * sigmask will have been stored in the signal frame, * and will be restored by sigreturn, so we can simply diff --git a/trunk/arch/sh/kernel/traps.c b/trunk/arch/sh/kernel/traps.c index 8f18930d5bf8..5b75cb6f8f9b 100644 --- a/trunk/arch/sh/kernel/traps.c +++ b/trunk/arch/sh/kernel/traps.c @@ -83,8 +83,6 @@ void die(const char * str, struct pt_regs * regs, long err) { static int die_counter; - oops_enter(); - console_verbose(); spin_lock_irq(&die_lock); bust_spinlocks(1); @@ -114,7 +112,6 @@ void die(const char * str, struct pt_regs * regs, long err) if (panic_on_oops) panic("Fatal exception"); - oops_exit(); do_exit(SIGSEGV); } diff --git a/trunk/arch/sh64/kernel/signal.c b/trunk/arch/sh64/kernel/signal.c index c8525ade0564..0bb4a8f94276 100644 --- a/trunk/arch/sh64/kernel/signal.c +++ b/trunk/arch/sh64/kernel/signal.c @@ -640,6 +640,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, if (regs->syscall_nr >= 0) { /* If so, check system call restarting.. */ switch (regs->regs[REG_RET]) { + case -ERESTART_RESTARTBLOCK: case -ERESTARTNOHAND: regs->regs[REG_RET] = -EINTR; break; diff --git a/trunk/drivers/s390/char/zcore.c b/trunk/drivers/s390/char/zcore.c index 4e711a985d59..66eb0688d523 100644 --- a/trunk/drivers/s390/char/zcore.c +++ b/trunk/drivers/s390/char/zcore.c @@ -267,9 +267,7 @@ struct zcore_header { u64 tod; cpuid_t cpu_id; u32 arch_id; - u32 volnr; u32 build_arch; - u64 rmem_size; char pad2[4016]; } __attribute__((packed,__aligned__(16))); @@ -561,7 +559,6 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr) else hdr->arch_id = DUMP_ARCH_S390; hdr->mem_size = sys_info.mem_size; - hdr->rmem_size = sys_info.mem_size; hdr->mem_end = sys_info.mem_size; hdr->num_pages = sys_info.mem_size / PAGE_SIZE; hdr->tod = get_clock(); diff --git a/trunk/fs/xfs/linux-2.6/xfs_lrw.c b/trunk/fs/xfs/linux-2.6/xfs_lrw.c index ed90403f0ee7..86fb671a8bcc 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_lrw.c +++ b/trunk/fs/xfs/linux-2.6/xfs_lrw.c @@ -159,7 +159,7 @@ xfs_iozero( if (status) goto unlock; - zero_user_page(page, offset, bytes, KM_USER0); + memclear_highpage_flush(page, offset, bytes); status = mapping->a_ops->commit_write(NULL, page, offset, offset + bytes); diff --git a/trunk/include/asm-s390/processor.h b/trunk/include/asm-s390/processor.h index 5cb480af65d5..e0fcea8c64c3 100644 --- a/trunk/include/asm-s390/processor.h +++ b/trunk/include/asm-s390/processor.h @@ -216,11 +216,6 @@ static inline void cpu_relax(void) barrier(); } -static inline void psw_set_key(unsigned int key) -{ - asm volatile("spka 0(%0)" : : "d" (key)); -} - /* * Set PSW to specified value. */ diff --git a/trunk/include/asm-s390/ptrace.h b/trunk/include/asm-s390/ptrace.h index 332ee73688fc..fa6ca87080e8 100644 --- a/trunk/include/asm-s390/ptrace.h +++ b/trunk/include/asm-s390/ptrace.h @@ -470,7 +470,14 @@ struct user_regs_struct #define regs_return_value(regs)((regs)->gprs[2]) #define profile_pc(regs) instruction_pointer(regs) extern void show_regs(struct pt_regs * regs); -#endif /* __KERNEL__ */ +#endif + +static inline void +psw_set_key(unsigned int key) +{ + asm volatile("spka 0(%0)" : : "d" (key)); +} + #endif /* __ASSEMBLY__ */ #endif /* _S390_PTRACE_H */ diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c index 7a22f0f3784a..5a2bef44a2f5 100644 --- a/trunk/sound/ppc/pmac.c +++ b/trunk/sound/ppc/pmac.c @@ -775,8 +775,7 @@ static int snd_pmac_free(struct snd_pmac *chip) out_le32(&chip->awacs->control, in_le32(&chip->awacs->control) & 0xfff); } - if (chip->node) - snd_pmac_sound_feature(chip, 0); + snd_pmac_sound_feature(chip, 0); /* clean up mixer if any */ if (chip->mixer_free) @@ -926,7 +925,6 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) } if (! sound) { of_node_put(chip->node); - chip->node = NULL; return -ENODEV; } prop = of_get_property(sound, "sub-frame", NULL); @@ -939,9 +937,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) printk(KERN_INFO "snd-powermac no longer handles any " "machines with a layout-id property " "in the device-tree, use snd-aoa.\n"); - of_node_put(sound); of_node_put(chip->node); - chip->node = NULL; return -ENODEV; } /* This should be verified on older screamers */ @@ -1301,6 +1297,8 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) return 0; __error: + if (chip->pdev) + pci_dev_put(chip->pdev); snd_pmac_free(chip); return err; }