Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932975AbZD3Psd (ORCPT ); Thu, 30 Apr 2009 11:48:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932413AbZD3Pmd (ORCPT ); Thu, 30 Apr 2009 11:42:33 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:51594 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932411AbZD3PmI (ORCPT ); Thu, 30 Apr 2009 11:42:08 -0400 Message-Id: <4fbdd954c63426e1fae6d26108ef744cc10d842a.1241105648.git.arnd@arndb.de> In-Reply-To: References: From: Remis Lima Baima Date: Mon, 27 Apr 2009 14:42:48 +0200 Subject: [PATCH 27/27] microblaze: use generic system.h Cc: linux-arch@vger.kernel.org, Michal Simek , Remis Lima Baima , linux-kernel@vger.kernel.org X-Provags-ID: V01U2FsdGVkX19ck02OXGBdV1m2kMHgH7GLjpBSQe9YkMIylsd /4836/WvdZ2aemFW+qKlPKrBmHR+Dy47cjNbJrijE3/VdGBdY0 Y5VrskaPWTQ7JhzhHRbKA== To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4893 Lines: 171 Parts of the microblaze system.h can be removed by falling back to the asm-generic version. Signed-off-by: Remis Lima Baima Signed-off-by: Arnd Bergmann --- arch/microblaze/include/asm/cmpxchg-local.h | 1 + arch/microblaze/include/asm/irqflags.h | 2 +- arch/microblaze/include/asm/system.h | 124 +++++++-------------------- 3 files changed, 32 insertions(+), 95 deletions(-) create mode 100644 arch/microblaze/include/asm/cmpxchg-local.h rewrite arch/microblaze/include/asm/system.h (67%) diff --git a/arch/microblaze/include/asm/cmpxchg-local.h b/arch/microblaze/include/asm/cmpxchg-local.h new file mode 100644 index 0000000..d3358a3 --- /dev/null +++ b/arch/microblaze/include/asm/cmpxchg-local.h @@ -0,0 +1 @@ +#include diff --git a/arch/microblaze/include/asm/irqflags.h b/arch/microblaze/include/asm/irqflags.h index dea6564..a6dbdee 100644 --- a/arch/microblaze/include/asm/irqflags.h +++ b/arch/microblaze/include/asm/irqflags.h @@ -9,7 +9,7 @@ #ifndef _ASM_MICROBLAZE_IRQFLAGS_H #define _ASM_MICROBLAZE_IRQFLAGS_H -#include +#include # if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h dissimilarity index 67% index b1ed615..a26ef8e 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -1,94 +1,30 @@ -/* - * Copyright (C) 2006 Atmark Techno, Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_MICROBLAZE_SYSTEM_H -#define _ASM_MICROBLAZE_SYSTEM_H - -#include -#include -#include - -#include -#include - -struct task_struct; -struct thread_info; - -extern struct task_struct *_switch_to(struct thread_info *prev, - struct thread_info *next); - -#define switch_to(prev, next, last) \ - do { \ - (last) = _switch_to(task_thread_info(prev), \ - task_thread_info(next)); \ - } while (0) - -#define smp_read_barrier_depends() do {} while (0) -#define read_barrier_depends() do {} while (0) - -#define nop() asm volatile ("nop") -#define mb() barrier() -#define rmb() mb() -#define wmb() mb() -#define set_mb(var, value) do { var = value; mb(); } while (0) -#define set_wmb(var, value) do { var = value; wmb(); } while (0) - -#define smp_mb() mb() -#define smp_rmb() rmb() -#define smp_wmb() wmb() - -void show_trace(struct task_struct *task, unsigned long *stack); -void __bad_xchg(volatile void *ptr, int size); - -static inline unsigned long __xchg(unsigned long x, volatile void *ptr, - int size) -{ - unsigned long ret; - unsigned long flags; - - switch (size) { - case 1: - local_irq_save(flags); - ret = *(volatile unsigned char *)ptr; - *(volatile unsigned char *)ptr = x; - local_irq_restore(flags); - break; - - case 4: - local_irq_save(flags); - ret = *(volatile unsigned long *)ptr; - *(volatile unsigned long *)ptr = x; - local_irq_restore(flags); - break; - default: - __bad_xchg(ptr, size), ret = 0; - break; - } - - return ret; -} - -void disable_hlt(void); -void enable_hlt(void); -void default_idle(void); - -#define xchg(ptr, x) \ - ((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr)))) - -void free_init_pages(char *what, unsigned long begin, unsigned long end); -void free_initmem(void); -extern char *klimit; -extern void ret_from_fork(void); - -#ifdef CONFIG_DEBUG_FS -extern struct dentry *of_debugfs_root; -#endif - -#define arch_align_stack(x) (x) - -#endif /* _ASM_MICROBLAZE_SYSTEM_H */ +/* + * Copyright (C) 2006 Atmark Techno, Inc. + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + */ +#ifndef _ASM_MICROBLAZE_SYSTEM_H +#define _ASM_MICROBLAZE_SYSTEM_H + +#define __switch_to _switch_to + +#include +#include + +#ifdef CONFIG_DEBUG_FS +extern struct dentry *of_debugfs_root; +#endif + +void show_trace(struct task_struct *task, unsigned long *stack); +void disable_hlt(void); +void enable_hlt(void); +void default_idle(void); +void free_init_pages(char *what, unsigned long begin, unsigned long end); +void free_initmem(void); + +extern char *klimit; +extern void ret_from_fork(void); + +#endif /* _ASM_MICROBLAZE_SYSTEM_H */ -- 1.5.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/