From: Kumar Gala Date: Tue, 20 Sep 2005 20:45:26 +0000 (-0500) Subject: [PATCH] powerpc: merge include/asm-ppc*/auxvec.h into include/asm-powerpc/auxvec.h X-Git-Tag: v2.6.15-rc1~59^2~261 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3f58542f476f9a77d5c59b62165e67290d7f55ed;p=linux-2.6-omap-h63xx.git [PATCH] powerpc: merge include/asm-ppc*/auxvec.h into include/asm-powerpc/auxvec.h Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras --- diff --git a/include/asm-ppc64/auxvec.h b/include/asm-powerpc/auxvec.h similarity index 84% rename from include/asm-ppc64/auxvec.h rename to include/asm-powerpc/auxvec.h index ac6381a106e..19a099b62cd 100644 --- a/include/asm-ppc64/auxvec.h +++ b/include/asm-powerpc/auxvec.h @@ -1,5 +1,5 @@ -#ifndef __PPC64_AUXVEC_H -#define __PPC64_AUXVEC_H +#ifndef _ASM_POWERPC_AUXVEC_H +#define _ASM_POWERPC_AUXVEC_H /* * We need to put in some extra aux table entries to tell glibc what @@ -16,4 +16,4 @@ */ #define AT_SYSINFO_EHDR 33 -#endif /* __PPC64_AUXVEC_H */ +#endif diff --git a/include/asm-ppc/auxvec.h b/include/asm-ppc/auxvec.h deleted file mode 100644 index 172358df29c..00000000000 --- a/include/asm-ppc/auxvec.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __PPC_AUXVEC_H -#define __PPC_AUXVEC_H - -/* - * We need to put in some extra aux table entries to tell glibc what - * the cache block size is, so it can use the dcbz instruction safely. - */ -#define AT_DCACHEBSIZE 19 -#define AT_ICACHEBSIZE 20 -#define AT_UCACHEBSIZE 21 -/* A special ignored type value for PPC, for glibc compatibility. */ -#define AT_IGNOREPPC 22 - -#endif