Commit d2480494 authored by Russell King's avatar Russell King

Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
parents ac062f74 3af3fd45
/* /*
* Copyright (C) 1995-2001 Russell King * Copyright (C) 1995-2003 Russell King
* 2001-2002 Keith Owens * 2001-2002 Keith Owens
* *
* Generate definitions needed by assembly language modules. * Generate definitions needed by assembly language modules.
...@@ -24,12 +24,21 @@ ...@@ -24,12 +24,21 @@
#if defined(__APCS_26__) #if defined(__APCS_26__)
#error Sorry, your compiler targets APCS-26 but this kernel requires APCS-32 #error Sorry, your compiler targets APCS-26 but this kernel requires APCS-32
#endif #endif
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95) /*
#error Sorry, your compiler is known to miscompile kernels. Only use gcc 2.95.3 and later. * GCC 2.95.1, 2.95.2: ignores register clobber list in asm().
#endif * GCC 3.0, 3.1: general bad code generation.
#if __GNUC__ == 2 && __GNUC_MINOR__ == 95 * GCC 3.2.0: incorrect function argument offset calculation.
/* shame we can't detect the .1 or .2 releases */ * GCC 3.2.x: miscompiles NEW_AUX_ENT in fs/binfmt_elf.c
#warning GCC 2.95.2 and earlier miscompiles kernels. * (http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view&pr=8896)
*/
#if __GNUC__ < 2 || \
(__GNUC__ == 2 && __GNUC_MINOR__ < 95) || \
(__GNUC__ == 2 && __GNUC_MINOR__ == 95 && __GNUC_PATCHLEVEL__ != 0 && \
__GNUC_PATCHLEVEL__ < 3) || \
(__GNUC__ == 3 && __GNUC_MINOR__ < 2) || \
(__GNUC__ == 3 && __GNUC_MINOR__ == 2 && __GNUC_PATCHLEVEL__ < 1)
#error Your compiler is too buggy; it is known to miscompile kernels.
#error Known good compilers: 2.95.3, 2.95.4, 2.96, 3.2.2+PR8896
#endif #endif
/* Use marker if you need to separate the values later */ /* Use marker if you need to separate the values later */
...@@ -62,7 +71,6 @@ int main(void) ...@@ -62,7 +71,6 @@ int main(void)
DEFINE(LPTE_EXEC, L_PTE_EXEC); DEFINE(LPTE_EXEC, L_PTE_EXEC);
DEFINE(LPTE_DIRTY, L_PTE_DIRTY); DEFINE(LPTE_DIRTY, L_PTE_DIRTY);
BLANK(); BLANK();
BLANK();
DEFINE(PAGE_SZ, PAGE_SIZE); DEFINE(PAGE_SZ, PAGE_SIZE);
BLANK(); BLANK();
DEFINE(SYS_ERROR0, 0x9f0000); DEFINE(SYS_ERROR0, 0x9f0000);
......
/* /*
* linux/arch/arm/lib/calls.h * linux/arch/arm/kernel/calls.S
* *
* Copyright (C) 1995-1998 Russell King * Copyright (C) 1995-2003 Russell King
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
......
...@@ -330,7 +330,7 @@ static int __init consistent_init(void) ...@@ -330,7 +330,7 @@ static int __init consistent_init(void)
core_initcall(consistent_init); core_initcall(consistent_init);
/* /*
* make an area consistent for devices. * Make an area consistent for devices.
*/ */
void consistent_sync(void *vaddr, size_t size, int direction) void consistent_sync(void *vaddr, size_t size, int direction)
{ {
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#ifndef __ASM_BUGS_H #ifndef __ASM_BUGS_H
#define __ASM_BUGS_H #define __ASM_BUGS_H
#include <asm/proc-fns.h>
#define check_bugs() do { } while (0) #define check_bugs() do { } while (0)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment