Commit 397cbdc2 authored by Linus Torvalds's avatar Linus Torvalds

v2.5.2.4 -> v2.5.2.4.1

- Patrick Mochel: devicefs locking cleanups, refcount fixes
- Brian Gerst: apic timer cleanup
- Adam Richter: fix loop over block device bio breakage, ipfwadm compile fix
- Peter Anvin: bootproto v2.03
- me: split up Configure.help over the subdirectories where it is used
parent 9d6ba121
...@@ -31,7 +31,7 @@ al espa ...@@ -31,7 +31,7 @@ al espa
Eine deutsche Version dieser Datei finden Sie unter Eine deutsche Version dieser Datei finden Sie unter
<http://www.stefan-winter.de/Changes-2.4.0.txt>. <http://www.stefan-winter.de/Changes-2.4.0.txt>.
Last updated: November 29, 2001 Last updated: January 22, 2002
Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu). Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu).
...@@ -106,8 +106,8 @@ assembling the 16-bit boot code, removing the need for as86 to compile ...@@ -106,8 +106,8 @@ assembling the 16-bit boot code, removing the need for as86 to compile
your kernel. This change does, however, mean that you need a recent your kernel. This change does, however, mean that you need a recent
release of binutils. release of binutils.
System utils System utililities
============ ==================
Architectural changes Architectural changes
--------------------- ---------------------
...@@ -261,8 +261,8 @@ needs to be recompiled or (preferably) upgraded. ...@@ -261,8 +261,8 @@ needs to be recompiled or (preferably) upgraded.
Getting updated software Getting updated software
======================== ========================
Compilers Kernel compilation
********* ******************
egcs 1.1.2 (gcc 2.91.66) egcs 1.1.2 (gcc 2.91.66)
------------------------ ------------------------
...@@ -272,15 +272,12 @@ gcc 2.95.3 ...@@ -272,15 +272,12 @@ gcc 2.95.3
---------- ----------
o <ftp://ftp.gnu.org/gnu/gcc/gcc-2.95.3.tar.gz> o <ftp://ftp.gnu.org/gnu/gcc/gcc-2.95.3.tar.gz>
Gnu Make
********
Make 3.77 Make 3.77
--------- ---------
o <ftp://ftp.gnu.org/gnu/make/make-3.77.tar.gz> o <ftp://ftp.gnu.org/gnu/make/make-3.77.tar.gz>
Binutils Binutils
******** --------
o <ftp://ftp.kernel.org/pub/linux/devel/binutils/> o <ftp://ftp.kernel.org/pub/linux/devel/binutils/>
System utilities System utilities
...@@ -332,10 +329,10 @@ o <http://www.urbanmyth.org/microcode/> ...@@ -332,10 +329,10 @@ o <http://www.urbanmyth.org/microcode/>
Powertweak Powertweak
---------- ----------
o <http://powertweak.sourceforge.net> o <http://powertweak.sourceforge.net/>
Network Networking
******* **********
PPP PPP
--- ---
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
---------------------------- ----------------------------
H. Peter Anvin <hpa@zytor.com> H. Peter Anvin <hpa@zytor.com>
Last update 2000-10-29 Last update 2002-01-01
On the i386 platform, the Linux kernel uses a rather complicated boot On the i386 platform, the Linux kernel uses a rather complicated boot
convention. This has evolved partially due to historical aspects, as convention. This has evolved partially due to historical aspects, as
...@@ -25,12 +25,15 @@ Protocol 2.00: (Kernel 1.3.73) Added bzImage and initrd support, as ...@@ -25,12 +25,15 @@ Protocol 2.00: (Kernel 1.3.73) Added bzImage and initrd support, as
Protocol 2.01: (Kernel 1.3.76) Added a heap overrun warning. Protocol 2.01: (Kernel 1.3.76) Added a heap overrun warning.
Protocol 2.02: (Kernel 2.4.0-test3-pre3) New command line protocol. Protocol 2.02: (Kernel 2.4.0-test3-pre3) New command line protocol.
Lower the conventional memory ceiling. No overwrite Lower the conventional memory ceiling. No overwrite
of the traditional setup area, thus making booting of the traditional setup area, thus making booting
safe for systems which use the EBDA from SMM or 32-bit safe for systems which use the EBDA from SMM or 32-bit
BIOS entry points. zImage deprecated but still BIOS entry points. zImage deprecated but still
supported. supported.
Protocol 2.03: (Kernel 2.4.18-pre1) Explicitly makes the highest possible
initrd address available to the bootloader.
**** MEMORY LAYOUT **** MEMORY LAYOUT
...@@ -45,7 +48,7 @@ zImage kernels, typically looks like: ...@@ -45,7 +48,7 @@ zImage kernels, typically looks like:
098000 +------------------------+ 098000 +------------------------+
| Kernel setup | The kernel real-mode code. | Kernel setup | The kernel real-mode code.
090200 +------------------------+ 090200 +------------------------+
| Kernel boot sector | The kernel legacy boot sector. | Kernel boot sector | The kernel legacy boot sector.
090000 +------------------------+ 090000 +------------------------+
| Protected-mode kernel | The bulk of the kernel image. | Protected-mode kernel | The bulk of the kernel image.
010000 +------------------------+ 010000 +------------------------+
...@@ -62,16 +65,16 @@ zImage kernels, typically looks like: ...@@ -62,16 +65,16 @@ zImage kernels, typically looks like:
When using bzImage, the protected-mode kernel was relocated to When using bzImage, the protected-mode kernel was relocated to
0x100000 ("high memory"), and the kernel real-mode block (boot sector, 0x100000 ("high memory"), and the kernel real-mode block (boot sector,
setup, and stack/heap) was made relocatable to any address between setup, and stack/heap) was made relocatable to any address between
0x10000 and end of low memory. Unfortunately, in protocols 2.00 and 0x10000 and end of low memory. Unfortunately, in protocols 2.00 and
2.01 the command line is still required to live in the 0x9XXXX memory 2.01 the command line is still required to live in the 0x9XXXX memory
range, and that memory range is still overwritten by the early kernel. range, and that memory range is still overwritten by the early kernel.
The 2.02 protocol fixes that. The 2.02 protocol resolves that problem.
It is desirable to keep the "memory ceiling" -- the highest point in It is desirable to keep the "memory ceiling" -- the highest point in
low memory touched by the boot loader -- as low as possible, since low memory touched by the boot loader -- as low as possible, since
some newer BIOSes have begun to allocate some rather large amounts of some newer BIOSes have begun to allocate some rather large amounts of
memory, called the Extended BIOS Data Area, near the top of low memory, called the Extended BIOS Data Area, near the top of low
memory. The boot loader should use the "INT 12h" BIOS call to verify memory. The boot loader should use the "INT 12h" BIOS call to verify
how much low memory is available. how much low memory is available.
Unfortunately, if INT 12h reports that the amount of memory is too Unfortunately, if INT 12h reports that the amount of memory is too
...@@ -112,7 +115,8 @@ Offset Proto Name Meaning ...@@ -112,7 +115,8 @@ Offset Proto Name Meaning
0202/4 2.00+ header Magic signature "HdrS" 0202/4 2.00+ header Magic signature "HdrS"
0206/2 2.00+ version Boot protocol version supported 0206/2 2.00+ version Boot protocol version supported
0208/4 2.00+ realmode_swtch Boot loader hook (see below) 0208/4 2.00+ realmode_swtch Boot loader hook (see below)
020C/4 2.00+ start_sys Points to kernel version string 020C/2 2.00+ start_sys The load-low segment (0x1000) (obsolete)
020E/2 2.00+ kernel_version Pointer to kernel version string
0210/1 2.00+ type_of_loader Boot loader identifier 0210/1 2.00+ type_of_loader Boot loader identifier
0211/1 2.00+ loadflags Boot protocol option flags 0211/1 2.00+ loadflags Boot protocol option flags
0212/2 2.00+ setup_move_size Move to high memory size (used with hooks) 0212/2 2.00+ setup_move_size Move to high memory size (used with hooks)
...@@ -123,6 +127,7 @@ Offset Proto Name Meaning ...@@ -123,6 +127,7 @@ Offset Proto Name Meaning
0224/2 2.01+ heap_end_ptr Free memory after setup end 0224/2 2.01+ heap_end_ptr Free memory after setup end
0226/2 N/A pad1 Unused 0226/2 N/A pad1 Unused
0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line 0228/4 2.02+ cmd_line_ptr 32-bit pointer to the kernel command line
022C/4 2.03+ initrd_addr_max Highest legal initrd address
For backwards compatibility, if the setup_sects field contains 0, the For backwards compatibility, if the setup_sects field contains 0, the
real value is 4. real value is 4.
...@@ -140,6 +145,15 @@ e.g. protocol version 2.01 will contain 0x0201 in this field. When ...@@ -140,6 +145,15 @@ e.g. protocol version 2.01 will contain 0x0201 in this field. When
setting fields in the header, you must make sure only to set fields setting fields in the header, you must make sure only to set fields
supported by the protocol version in use. supported by the protocol version in use.
The "kernel_version" field, if set to a nonzero value, contains a
pointer to a null-terminated human-readable kernel version number
string, less 0x200. This can be used to display the kernel version to
the user. This value should be less than (0x200*setup_sects). For
example, if this value is set to 0x1c00, the kernel version number
string can be found at offset 0x1e00 in the kernel file. This is a
valid value if and only if the "setup_sects" field contains the value
14 or higher.
Most boot loaders will simply load the kernel at its target address Most boot loaders will simply load the kernel at its target address
directly. Such boot loaders do not need to worry about filling in directly. Such boot loaders do not need to worry about filling in
most of the fields in the header. The following fields should be most of the fields in the header. The following fields should be
...@@ -160,6 +174,9 @@ filled out, however: ...@@ -160,6 +174,9 @@ filled out, however:
3 SYSLINUX 3 SYSLINUX
4 EtherBoot 4 EtherBoot
Please contact <hpa@zytor.com> if you need a bootloader ID
value assigned.
loadflags, heap_end_ptr: loadflags, heap_end_ptr:
If the protocol version is 2.01 or higher, enter the If the protocol version is 2.01 or higher, enter the
offset limit of the setup heap into heap_end_ptr and set the offset limit of the setup heap into heap_end_ptr and set the
...@@ -180,9 +197,9 @@ filled out, however: ...@@ -180,9 +197,9 @@ filled out, however:
The initrd should typically be located as high in memory as The initrd should typically be located as high in memory as
possible, as it may otherwise get overwritten by the early possible, as it may otherwise get overwritten by the early
kernel initialization sequence. However, it must never be kernel initialization sequence. However, it must never be
located above address 0x3C000000 if you want all kernels to located above the address specified in the initrd_addr_max
read it. field. The initrd should be at least 4K page aligned.
cmd_line_ptr: cmd_line_ptr:
If the protocol version is 2.02 or higher, this is a 32-bit If the protocol version is 2.02 or higher, this is a 32-bit
...@@ -192,7 +209,15 @@ filled out, however: ...@@ -192,7 +209,15 @@ filled out, however:
command line, in which case you can point this to an empty command line, in which case you can point this to an empty
string (or better yet, to the string "auto".) If this field string (or better yet, to the string "auto".) If this field
is left at zero, the kernel will assume that your boot loader is left at zero, the kernel will assume that your boot loader
does not support the 2.02 protocol. does not support the 2.02+ protocol.
ramdisk_max:
The maximum address that may be occupied by the initrd
contents. For boot protocols 2.02 or earlier, this field is
not present, and the maximum address is 0x37FFFFFF. (This
address is defined as the address of the highest safe byte, so
if your ramdisk is exactly 131072 bytes long and this field is
0x37FFFFFF, you can start your ramdisk at 0x37FE0000.)
**** THE KERNEL COMMAND LINE **** THE KERNEL COMMAND LINE
...@@ -254,14 +279,14 @@ Such a boot loader should enter the following fields in the header: ...@@ -254,14 +279,14 @@ Such a boot loader should enter the following fields in the header:
if ( protocol >= 0x0202 ) { if ( protocol >= 0x0202 ) {
cmd_line_ptr = base_ptr + 0x9000; cmd_line_ptr = base_ptr + 0x9000;
} else { } else {
cmd_line_magic = 0xA33F; cmd_line_magic = 0xA33F;
cmd_line_offset = 0x9000; cmd_line_offset = 0x9000;
setup_move_size = 0x9100; setup_move_size = 0x9100;
} }
} else { } else {
/* Very old kernel */ /* Very old kernel */
cmd_line_magic = 0xA33F; cmd_line_magic = 0xA33F;
cmd_line_offset = 0x9000; cmd_line_offset = 0x9000;
/* A very old kernel MUST have its real-mode code /* A very old kernel MUST have its real-mode code
...@@ -411,4 +436,3 @@ IMPORTANT: All the hooks are required to preserve %esp, %ebp, %esi and ...@@ -411,4 +436,3 @@ IMPORTANT: All the hooks are required to preserve %esp, %ebp, %esi and
After completing your hook, you should jump to the address After completing your hook, you should jump to the address
that was in this field before your boot loader overwrote it. that was in this field before your boot loader overwrote it.
VERSION = 2 VERSION = 2
PATCHLEVEL = 5 PATCHLEVEL = 5
SUBLEVEL = 3 SUBLEVEL = 3
EXTRAVERSION =-pre4 EXTRAVERSION =-pre5
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
This diff is collapsed.
...@@ -8,21 +8,7 @@ define_bool CONFIG_UID16 n ...@@ -8,21 +8,7 @@ define_bool CONFIG_UID16 n
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK n define_bool CONFIG_RWSEM_GENERIC_SPINLOCK n
define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM y
mainmenu_name "Kernel configuration of Linux for Alpha machines" source init/Config.in
mainmenu_option next_comment
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then
bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS
bool 'Kernel module loader' CONFIG_KMOD
fi
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
...@@ -241,10 +227,6 @@ else ...@@ -241,10 +227,6 @@ else
define_bool CONFIG_PCMCIA n define_bool CONFIG_PCMCIA n
fi fi
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
if [ "$CONFIG_PROC_FS" = "y" ]; then if [ "$CONFIG_PROC_FS" = "y" ]; then
choice 'Kernel core (/proc/kcore) format' \ choice 'Kernel core (/proc/kcore) format' \
"ELF CONFIG_KCORE_ELF \ "ELF CONFIG_KCORE_ELF \
......
This diff is collapsed.
...@@ -14,20 +14,7 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n ...@@ -14,20 +14,7 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
define_bool CONFIG_GENERIC_BUST_SPINLOCK n define_bool CONFIG_GENERIC_BUST_SPINLOCK n
define_bool CONFIG_GENERIC_ISA_DMA n define_bool CONFIG_GENERIC_ISA_DMA n
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
bool 'Prompt for obsolete code/drivers' CONFIG_OBSOLETE
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
dep_bool ' Set version information on all module symbols' CONFIG_MODVERSIONS $CONFIG_MODULES
dep_bool ' Kernel module loader' CONFIG_KMOD $CONFIG_MODULES
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'System Type' comment 'System Type'
...@@ -467,10 +454,6 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then ...@@ -467,10 +454,6 @@ if [ "$CONFIG_HOTPLUG" = "y" ]; then
else else
define_bool CONFIG_PCMCIA n define_bool CONFIG_PCMCIA n
fi fi
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
comment 'At least one math emulation must be selected' comment 'At least one math emulation must be selected'
tristate 'NWFPE math emulation' CONFIG_FPE_NWFPE tristate 'NWFPE math emulation' CONFIG_FPE_NWFPE
dep_tristate 'FastFPE math emulation (experimental)' CONFIG_FPE_FASTFPE $CONFIG_EXPERIMENTAL dep_tristate 'FastFPE math emulation (experimental)' CONFIG_FPE_FASTFPE $CONFIG_EXPERIMENTAL
......
This diff is collapsed.
...@@ -8,28 +8,11 @@ define_bool CONFIG_UID16 y ...@@ -8,28 +8,11 @@ define_bool CONFIG_UID16 y
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then
bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
bool ' Kernel module loader' CONFIG_KMOD
fi
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
bool 'Use kernel gdb debugger' CONFIG_ETRAX_KGDB bool 'Use kernel gdb debugger' CONFIG_ETRAX_KGDB
......
This diff is collapsed.
This diff is collapsed.
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
#include <linux/compile.h> #include <linux/compile.h>
#include <asm/boot.h> #include <asm/boot.h>
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/page.h>
/* Signature words to ensure LILO loaded us right */ /* Signature words to ensure LILO loaded us right */
#define SIG1 0xAA55 #define SIG1 0xAA55
#define SIG2 0x5A5A #define SIG2 0x5A5A
...@@ -79,7 +80,7 @@ start: ...@@ -79,7 +80,7 @@ start:
# This is the setup header, and it must start at %cs:2 (old 0x9020:2) # This is the setup header, and it must start at %cs:2 (old 0x9020:2)
.ascii "HdrS" # header signature .ascii "HdrS" # header signature
.word 0x0202 # header version number (>= 0x0105) .word 0x0203 # header version number (>= 0x0105)
# or else old loadlin-1.5 will fail) # or else old loadlin-1.5 will fail)
realmode_swtch: .word 0, 0 # default_switch, SETUPSEG realmode_swtch: .word 0, 0 # default_switch, SETUPSEG
start_sys_seg: .word SYSSEG start_sys_seg: .word SYSSEG
...@@ -153,6 +154,10 @@ cmd_line_ptr: .long 0 # (Header version 0x0202 or later) ...@@ -153,6 +154,10 @@ cmd_line_ptr: .long 0 # (Header version 0x0202 or later)
# can be located anywhere in # can be located anywhere in
# low memory 0x10000 or higher. # low memory 0x10000 or higher.
ramdisk_max: .long __MAXMEM-1 # (Header version 0x0203 or later)
# The highest safe address for
# the contents of an initrd
trampoline: call start_of_setup trampoline: call start_of_setup
.space 1024 .space 1024
# End of setup header ##################################################### # End of setup header #####################################################
......
...@@ -10,19 +10,7 @@ define_bool CONFIG_SBUS n ...@@ -10,19 +10,7 @@ define_bool CONFIG_SBUS n
define_bool CONFIG_UID16 y define_bool CONFIG_UID16 y
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then
bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
bool ' Kernel module loader' CONFIG_KMOD
fi
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'Processor type and features' comment 'Processor type and features'
...@@ -197,11 +185,6 @@ if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then ...@@ -197,11 +185,6 @@ if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
fi fi
endmenu endmenu
mainmenu_option next_comment
comment 'General setup'
bool 'Networking support' CONFIG_NET
# Visual Workstation support is utterly broken. # Visual Workstation support is utterly broken.
# If you want to see it working mail an VW540 to hch@infradead.org 8) # If you want to see it working mail an VW540 to hch@infradead.org 8)
#bool 'SGI Visual Workstation support' CONFIG_VISWS #bool 'SGI Visual Workstation support' CONFIG_VISWS
...@@ -249,9 +232,6 @@ else ...@@ -249,9 +232,6 @@ else
define_bool CONFIG_HOTPLUG_PCI n define_bool CONFIG_HOTPLUG_PCI n
fi fi
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
if [ "$CONFIG_PROC_FS" = "y" ]; then if [ "$CONFIG_PROC_FS" = "y" ]; then
choice 'Kernel core (/proc/kcore) format' \ choice 'Kernel core (/proc/kcore) format' \
"ELF CONFIG_KCORE_ELF \ "ELF CONFIG_KCORE_ELF \
......
...@@ -6,6 +6,14 @@ CONFIG_ISA=y ...@@ -6,6 +6,14 @@ CONFIG_ISA=y
# CONFIG_SBUS is not set # CONFIG_SBUS is not set
CONFIG_UID16=y CONFIG_UID16=y
#
# General setup
#
CONFIG_NET=y
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
# #
# Code maturity level options # Code maturity level options
# #
...@@ -62,11 +70,6 @@ CONFIG_NOHIGHMEM=y ...@@ -62,11 +70,6 @@ CONFIG_NOHIGHMEM=y
CONFIG_SMP=y CONFIG_SMP=y
# CONFIG_MULTIQUAD is not set # CONFIG_MULTIQUAD is not set
CONFIG_HAVE_DEC_LOCK=y CONFIG_HAVE_DEC_LOCK=y
#
# General setup
#
CONFIG_NET=y
CONFIG_X86_IO_APIC=y CONFIG_X86_IO_APIC=y
CONFIG_X86_LOCAL_APIC=y CONFIG_X86_LOCAL_APIC=y
CONFIG_PCI=y CONFIG_PCI=y
...@@ -95,9 +98,6 @@ CONFIG_CARDBUS=y ...@@ -95,9 +98,6 @@ CONFIG_CARDBUS=y
# CONFIG_HOTPLUG_PCI is not set # CONFIG_HOTPLUG_PCI is not set
# CONFIG_HOTPLUG_PCI_COMPAQ is not set # CONFIG_HOTPLUG_PCI_COMPAQ is not set
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
CONFIG_KCORE_ELF=y CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set # CONFIG_KCORE_AOUT is not set
CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_AOUT=y
......
...@@ -1014,7 +1014,7 @@ inline void smp_local_timer_interrupt(struct pt_regs * regs) ...@@ -1014,7 +1014,7 @@ inline void smp_local_timer_interrupt(struct pt_regs * regs)
*/ */
unsigned int apic_timer_irqs [NR_CPUS]; unsigned int apic_timer_irqs [NR_CPUS];
void smp_apic_timer_interrupt(struct pt_regs * regs) void smp_apic_timer_interrupt(struct pt_regs regs)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
...@@ -1034,7 +1034,7 @@ void smp_apic_timer_interrupt(struct pt_regs * regs) ...@@ -1034,7 +1034,7 @@ void smp_apic_timer_interrupt(struct pt_regs * regs)
* interrupt lock, which is the WrongThing (tm) to do. * interrupt lock, which is the WrongThing (tm) to do.
*/ */
irq_enter(cpu, 0); irq_enter(cpu, 0);
smp_local_timer_interrupt(regs); smp_local_timer_interrupt(&regs);
irq_exit(cpu, 0); irq_exit(cpu, 0);
if (softirq_pending(cpu)) if (softirq_pending(cpu))
......
...@@ -93,7 +93,7 @@ BUILD_SMP_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR) ...@@ -93,7 +93,7 @@ BUILD_SMP_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
* a much simpler SMP time architecture: * a much simpler SMP time architecture:
*/ */
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
BUILD_SMP_TIMER_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR) BUILD_SMP_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
BUILD_SMP_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR) BUILD_SMP_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
BUILD_SMP_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR) BUILD_SMP_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
#endif #endif
......
...@@ -704,10 +704,8 @@ void __init setup_arch(char **cmdline_p) ...@@ -704,10 +704,8 @@ void __init setup_arch(char **cmdline_p)
#define PFN_PHYS(x) ((x) << PAGE_SHIFT) #define PFN_PHYS(x) ((x) << PAGE_SHIFT)
/* /*
* 128MB for vmalloc and initrd * Reserved space for vmalloc and iomap - defined in asm/page.h
*/ */
#define VMALLOC_RESERVE (unsigned long)(128 << 20)
#define MAXMEM (unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE)
#define MAXMEM_PFN PFN_DOWN(MAXMEM) #define MAXMEM_PFN PFN_DOWN(MAXMEM)
#define MAX_NONPAE_PFN (1 << 20) #define MAX_NONPAE_PFN (1 << 20)
......
This diff is collapsed.
mainmenu_name "Kernel configuration of Linux for IA-64 machines" mainmenu_name "Kernel configuration of Linux for IA-64 machines"
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then
bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
bool ' Kernel module loader' CONFIG_KMOD
fi
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
...@@ -99,10 +87,6 @@ bool 'Performance monitor support' CONFIG_PERFMON ...@@ -99,10 +87,6 @@ bool 'Performance monitor support' CONFIG_PERFMON
tristate '/proc/pal support' CONFIG_IA64_PALINFO tristate '/proc/pal support' CONFIG_IA64_PALINFO
tristate '/proc/efi/vars support' CONFIG_EFI_VARS tristate '/proc/efi/vars support' CONFIG_EFI_VARS
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
......
This diff is collapsed.
...@@ -9,19 +9,7 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n ...@@ -9,19 +9,7 @@ define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_name "Linux/68k Kernel Configuration" mainmenu_name "Linux/68k Kernel Configuration"
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment
comment 'Loadable module support'
bool 'Enable loadable module support' CONFIG_MODULES
if [ "$CONFIG_MODULES" = "y" ]; then
bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
bool ' Kernel module loader' CONFIG_KMOD
fi
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'Platform dependent setup' comment 'Platform dependent setup'
...@@ -89,10 +77,6 @@ endmenu ...@@ -89,10 +77,6 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
if [ "$CONFIG_PROC_FS" = "y" ]; then if [ "$CONFIG_PROC_FS" = "y" ]; then
choice 'Kernel core (/proc/kcore) format' \ choice 'Kernel core (/proc/kcore) format' \
"ELF CONFIG_KCORE_ELF \ "ELF CONFIG_KCORE_ELF \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -10,10 +10,7 @@ define_bool CONFIG_UID16 n ...@@ -10,10 +10,7 @@ define_bool CONFIG_UID16 n
define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n define_bool CONFIG_RWSEM_XCHGADD_ALGORITHM n
mainmenu_option next_comment source init/Config.in
comment 'Code maturity level options'
bool 'Prompt for development and/or incomplete code/drivers' CONFIG_EXPERIMENTAL
endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General options' comment 'General options'
...@@ -60,11 +57,6 @@ endmenu ...@@ -60,11 +57,6 @@ endmenu
mainmenu_option next_comment mainmenu_option next_comment
comment 'General setup' comment 'General setup'
bool 'Networking support' CONFIG_NET
bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM tristate 'Kernel support for SOM binaries' CONFIG_BINFMT_SOM
tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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