It's a pain for architecture maintainers to keep the toplevel Kconfig
files in sync.  This addresses part of the problem by moving all the
standard driver includes to drivers/Kconfig.  As a bonus, it moves all
the device drivers together in a menu which tames menuconfig somewhat.

This patch only touches i386.  Other architectures can join the party
as soon as they feel ready to inflict all the choices on their userbase.

From:  Marcel Sebek <sebek64@post.cz>

(Acked by  William Lee Irwin III <wli@holomorphy.com>)

Other architectures have other low-level serial chips.

Make "PC" configuration shorthand (same as "X86 && !EMBEDDED"
right now, but other PC-like architectures may start using it)

Kconfig cleanup megapatch from Nicolas Kaiser <nikai@nikai.net>.

modules.txt no longer exists, and the common wording used to refer to
it sucks.  This is all by Nicolas Kaiser's: at Randy and Matthew's
request, "say M" changed to "choose M" (more sense for graphical front
ends, too).

At present you can set CONFIG_HUGETLB_PAGE and not CONFIG_HUGETLBFS, which
give the kernel low-level hugepage support, but no userspace API with which
to access it.

And with the recent hugetlbfs-accounting fix, the low-level code needs
functions which are in hugetlbfs, so CONFIG_HUGETLBFS=n,
CONFIG_HUGETLB_PAGE=y doesn't even link.

So we flip things around: CONFIG_HUGETLB_PAGE is set if CONFIG_HUGETLBFS is
set and CONFIG_HUGETLB_PAGE is unset if CONFIG_HUGETLBFS is unset.  The
CONFIG_HUGETLB_PAGE option hence disappears from the per-arch configuration
menus.

Note that this restores CONFIG_ACPI_HT_ONLY as a sub-set of CONFIG_ACPI rather than a dependency.

From: john stultz <johnstul@us.ibm.com>

Don't try to support more than NR_CPUS cpus: things overflow.

Also, increase the default in config for some architectures.  (Dave
Hansen).

- Add option for CONFIG_PM_DISK (suspend-to-disk functionality).

- Other arch's should include this, instead of defining their own options. 
  Will fixup any problems with that..

The new HPET RTC emulation code uses a function in rtc.c, get_rtc_time().

So that function was made non-static.  Problem is, the same function name is
used elsewhere by some architectures, so there will be linkage problems.

And rtc_get_time() is used too, so I renamed it to rtc_get_rtc_time().

Also, the HPET code was setting CONFIG_HPET_EMULATE_RTC by hand in a header
file.  Fix it to use the Kconfig system properly.

From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>

Miscallaneous makefile and config changes

From: Adrian Bunk <bunk@fs.tum.de>

Remove CONFIG_KCORE_AOUT: the ability to present /proc/kcore in a.out
format.

I've checked with various arch maintainers.  It won't be missed.

This one snuck in...

 - debugging message for ACPI

 - Intel guys removed it from their 2.4 tree (at my request)

 - it's point-in-time specific (message becomes nearly useless after
   ACPI bug fixes)

 - b/c of the point-in-time issue, it's IMO much more appropriate for a
   vendor kernel (where the message, I agree, may be helpful)

 - can potentially mislead users to the correct cause of root mount failure

 - overall, I disagree with adding messages like this.  The number one
   bug report, by far, for networking drivers is ACPI-related (no
   interrupts delivered).  You don't see me adding "boot with acpi=off"
   messages to the net subsystem.

From: William Lee Irwin III <wli@holomorphy.com>

Contributions from:
	Jan Dittmer <jdittmer@sfhq.hn.org>
	Arnd Bergmann <arnd@arndb.de>
	"Bryan O'Sullivan" <bos@serpentine.com>
	"David S. Miller" <davem@redhat.com>
	Badari Pulavarty <pbadari@us.ibm.com>
	"Martin J. Bligh" <mbligh@aracnet.com>
	Zwane Mwaikambo <zwane@linuxpower.ca>

It has ben tested on x86, sparc64, x86_64, ia64 (I think), ppc and ppc64.

cpumask_t enables systems with NR_CPUS > BITS_PER_LONG to utilize all their
cpus by creating an abstract data type dedicated to representing cpu
bitmasks, similar to fd sets from userspace, and sweeping the appropriate
code to update callers to the access API.  The fd set-like structure is
according to Linus' own suggestion; the macro calling convention to ambiguate
representations with minimal code impact is my own invention.

Specifically, a new set of inline functions for manipulating arbitrary-width
bitmaps is introduced with a relatively simple implementation, in tandem with
a new data type representing bitmaps of width NR_CPUS, cpumask_t, whose
accessor functions are defined in terms of the bitmap manipulation inlines.
This bitmap ADT found an additional use in i386 arch code handling sparse
physical APIC ID's, which was convenient to use in this case as the
accounting structure was required to be wider to accommodate the physids
consumed by larger numbers of cpus.

For the sake of simplicity and low code impact, these cpu bitmasks are passed
primarily by value; however, an additional set of accessors along with an
auxiliary data type with const call-by-reference semantics is provided to
address performance concerns raised in connection with very large systems,
such as SGI's larger models, where copying and call-by-value overhead would
be prohibitive.  Few (if any) users of the call-by-reference API are
immediately introduced.

Also, in order to avoid calling convention overhead on architectures where
structures are required to be passed by value, NR_CPUS <= BITS_PER_LONG is
special-cased so that cpumask_t falls back to an unsigned long and the
accessors perform the usual bit twiddling on unsigned longs as opposed to
arrays thereof.  Audits were done with the structure overhead in-place,
restoring this special-casing only afterward so as to ensure a more complete
API conversion while undergoing the majority of its end-user exposure in -mm.
 More -mm's were shipped after its restoration to be sure that was tested,
too.

The immediate users of this functionality are Sun sparc64 systems, SGI mips64
and ia64 systems, and IBM ia32, ppc64, and s390 systems.  Of these, only the
ppc64 machines needing the functionality have yet to be released; all others
have had systems requiring it for full functionality for at least 6 months,
and in some cases, since the initial Linux port to the affected architecture.

dmi_scan.c: delete some incomplete code that broke !SMP + APIC build; add ACPI blacklist comment,
move __i386__ out of do_mounts.c and into create mount_root_failed_msg()

build: add ACPI_HT, delete ACPI_HT_ONLY
boot: add acpi={force, off, ht}; delete "noht", "acpismp="
add DMI blacklist from UnitedLinux

Allows all architectures to simply include the sound/Kconfig file.
Now somebody can finally update the comment for CONFIG_SOUND ;-).

- Each dependent on CONFIG_PM only.
- From Pavel Machek.

From: Diego Calleja Garcia <diegocg@teleline.es>

Move CONFIG_KALLSYMS out of the arch directory and into init/.

It defaults to "on" unless the user explicitly turns it off in the
"embedded systems" menu.

From: Manfred Spraul <manfred@colorfullife.com>

Manfred's latest page unmapping debug patch.

The patch adds support for a special debug mode to both the page and the slab
allocator: Unused pages are removed from the kernel linear mapping.  This
means that now any access to freed memory will cause an immediate exception.
Right now, read accesses remain totally unnoticed and write accesses may be
catched by the slab poisoning, but usually far too late for a meaningfull bug
report.

The implementation is based on a new arch dependant function,
kernel_map_pages(), that removes the pages from the linear mapping.  It's
right now only implemented for i386.

Changelog:

- Add kernel_map_pages() for i386, based on change_page_attr.  If
  DEBUG_PAGEALLOC is not set, then the function is an empty stub.  The stub
  is in <linux/mm.h>, i.e.  it exists for all archs.

- Make change_page_attr irq safe.  Note that it's not fully irq safe due to
  the lack of the tlb flush ipi, but it's good enough for kernel_map_pages().
   Another problem is that kernel_map_pages is not permitted to fail, thus
  PSE is disabled if DEBUG_PAGEALLOC is enabled

- use kernel_map pages for the page allocator.

- use kernel_map_pages for the slab allocator.

  I couldn't resist and added additional debugging support into mm/slab.c:

  * at kfree time, the complete backtrace of the kfree caller is stored
    in the freed object.

  * a ptrinfo() function that dumps all known data about a kernel virtual
    address: the pte value, if it belongs to a slab cache the cache name and
    additional info.

  * merging of common code: new helper function obj_dbglen and obj_dbghdr
    for the conversion between the user visible object pointers/len and the
    actual, internal addresses and len values.

This patch moves all the duplicated cdrom Kconfig bits from arch/*/Kconfig
to drivers/cdrom/Kconfig

Move all the SCSI Kconfig bits from arch/*/Kconfig into driver/scsi/Kconfig.
Also add notes about FireWire & USB.

When CONFIG_DEBUG_INFO is set to Y, -g will be added to CFLAGS.
Several architectures already put -g in CFLAGS, often via a patch
to the top-level makefile.
This option is put in the kernel hacking menu, guarded by CONFIG_DEBUG_KERNEL.

Added CONFIG_DEBUG_INFO in Kconfig for the architectures that
already had CONFIG_DEBUG_KERNEL

This patch creates fs/Kconfig.binfmt and converts all architectures to
use it.  I took the opportunity to spruce up the a.out help text for
the new millennium.

From: "Protasevich, Natalie" <Natalie.Protasevich@UNISYS.com>

Include ES7000 specific code for es7000 subarch.

Patch by Matthew Wilcox.

Allows all architectures to simply include the drivers/ide/Kconfig file.

  
This will let include/linux/pci.h get smaller, and is what I should 
have done in the first place 2 years ago...

From: Andi Kleen <ak@muc.de>

This patch adds an generic x86 subarchitecture. It is intended to provide
an dynamic interface for APIC drivers. There are already three subarchitectures
(bigsmp, summit, default) that only differ in how they drive the local APIC.
A fourth - Unisys ES7000 - is scheduled to be merged soon.

The subarchitecture concept separated this nicely, but it has the big
drawback that they are compile time options. A Linux vendor cannot
ship own binary kernel rpms for all of these machines. Runtime probing
is needed instead.

This patch adds a new "generic" subarchitecture that just acts as a
dynamic switching layer for APIC drivers. It only tries to virtualize
the APICs, no attempt is made to cover further incompatiblities.
This means machines like the Visual Workstation, pc9800 or
Voyager are not covered; but these are unlikely to be supported by
binary distributions anyways.

The generic arch reuses the existing interface in mach_ipi / mach_mpparse.h /
mach_apic.h and just pulls it using some macros into an "struct genapic"
object. The main APIC code does not recognize it, it is all hidden
in the mach-generic include files.

Auto detection of APIC types is supported in the usual way used by
existing ports like Summit - checking ACPI or mptables for specific
signatures - or it can be specified by the user using a new "apic="
boot option. I also moved the DMI scan to before the generic
subarchitecture probe, so DMI could be used in future too to probe
specific machines.

Some minor hacks were needed to avoid circular declaration of a few
symbols, but overall it's fairly clean.

The patch has been tested on a Summit machine, an generic 4 virtual CPUs
Xeon and on an ES7000.

From Robert Day, through "Randy.Dunlap" <rddunlap@osdl.org>

This is a patch from Robert Day that does the following:

1) shift menu item in "Processor type and features" menu
2) clean up "Bus options" menu so it's actually hierarchical

Part of it (moving X86_IO_APIC around) looked a little odd to me,
so I asked Roman Zippel about it, and he replied:

"It's correct, although I wouldn't call it a 'design quirk'. :)
It forces one to group options which belong logically together and in this
case X86_IO_APIC is really a bit misplaced, even if it's not visible."

I have tested it (on 2.5.68-plain) and it does indeed make the menus
more hierarchical.

Don't disable the Northbridge Machine Check.

Use the unrolled "INTEL_USERCOPY" too.

Swsusp without swap makes no sense, and leads to compilation
failure.  So make the dependency clear in the config files.

of Intel CPU optimizations. From Andi Kleen.

This is a patch from Robert P.J. Day that replaces www.linuxdoc.org
(which is outdated and unspported according to www.tldp.org)
with www.tldp.org in lots of Kconfig files.

(Steve Cole and co)

Patch from Martin J. Bligh and Dave Hansen

People with ordinary PCs are accidentally turning on NUMA support, and people
with NUMA machines are finding the NUMA option mysteriously disappearing.
This patch sets the defaults to sane things for everyone, and only allows you
to turn on NUMA with both SMP and 64Gb support on (it's useful for the
distros on non-Summit boxes, but not on their UP kernels ;-)).

I've also moved it below the highmem options, as it logically depends on
them, so this makes more sense.  For those searching for NUMA support on
*real* NUMA machine, Dave has provided some guiding comments to show them
what they messed up (it's totally non-obvious).  Hopefully this will stop
people's recent unfortunate foot-wounds (I think UP machines were defaulting
to NUMA on ...  oops).

Patch from Tom Rini <trini@kernel.crashing.org>

Take CONFIG_SWAP out of the top-level menu into the general setup menu.  Make
it dependent on CONFIG_MMU and common to all architectures.

From Andy Whitcroft

A few very simple changes in order to make CONFIG_NUMA work everywhere, so
the distros can build one common binary kernel for distributions.