x86/x86-64 merge for 2.6.19

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* x86/x86-64 merge for 2.6.19
@ 2006-09-26 10:44 Andi Kleen
  2006-09-26 19:48 ` Linus Torvalds
  2006-09-27  5:41 ` Andrew Morton
  0 siblings, 2 replies; 17+ messages in thread
From: Andi Kleen @ 2006-09-26 10:44 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, discuss

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 25610 bytes --]


Linus,

Please pull 'for-linus' from
	
	http://one.firstfloor.org/home/andi/git/linus-2.6

[This is my first voyage into git land this so please excuse any mistakes.
This is actually just a quick merge of my quilt tree, which is still
the authoritative tree]

No diffs because it is far too much.

Changes:

Aaron Durbin:
      Insert GART region into resource map
      MMCONFIG and new Intel motherboards

Adam Henley:
      A few trivial spelling and grammar fixes

Adrian Bunk:
      i386: make functions static
      i386: Make acpi_force static
      i386: Make enable_local_apic static

adurbin@google.com:
      insert IOAPIC(s) and Local APIC into resource map
      i386: add HPET(s) into resource map

Andi Kleen:
      Update defconfig
      i386: Update defconfig
      i386: Allow to use GENERICARCH for UP kernels
      x86: Temporarily revert parts of the Core 2 nmi nmi watchdog support
      Add TIF_RESTORE_SIGMASK
      Add ppoll/pselect syscalls
      Fix up panic messages for different NMI panics
      i386: Enable NMI watchdog by default
      x86: Add portable getcpu call
      Clean up asm/smp.h includes
      Don't print virtual address in HPET initialization
      i386/x86-64: Don't randomize stack top when no randomization personality is set
      i386: Account spinlocks to the caller during profiling for !FP kernels
      Simplify profile_pc on x86-64
      Document backtracer selection options
      Support patchable lock prefix for pure assembly files
      Clean up read write lock assembly
      i386: Remove const case for rwlocks
      Add proper alignment to ENTRY
      i386: add alternative-asm.h to allow LOCK_PREFIX replacement in .S files
      i386: Redo semaphore and rwlock assembly helpers
      Remove leftover CVS Id in thunk.S
      Add some comments what tce.c actually does
      Remove all ifdefs for local/io apic
      Remove apic mismatch counter
      Remove old "focus disabled" chipset errata workaround
      Clean up and minor fixes to TLB flush
      i386: Minor fixes & cleanup to tlb flush
      Add some comments to entry.S
      Remove pirq overwrite support
      Remove leftover MCE/EISA support
      Remove obsolete PIC mode
      i386/x86-64: Remove obsolete sanity check in mptable parsing
      Factor out common io apic routing entry access
      i386: Factor out common io apic routing entry access
      Remove MPS table APIC renumbering
      Move early chipset quirks out to new file
      Replace mp bus array with bitmap for bus not pci
      Remove useless wrapper in mpparse.c code
      Remove some unneeded ACPI externs in mpparse.c
      Fix up some non linuxy style in ACPI functions in mpparse.c
      i386: Clean up code style in mpparse.c ACPI code
      Use BUILD_BUG_ON in apic.c build sanity checking
      x86: Detect CFI support in the assembler at runtime
      Remove obsolete CVS $Id$ from assembler files in arch/x86_64/kernel/*
      Add stack documentation document from Keith Owens
      i386: Remove lock section support in mutex.h
      i386: Remove lock section support in rwsem.h
      i386: Remove lock section support in semaphore.h
      Don't use lock section for mutexes and semaphores
      Clean up spin/rwlocks
      i386: Clean up spin/rwlocks
      Use early CPU identify before early command line parsing
      Convert x86-64 to early param
      Remove need for early lockdep init
      i386/x86-64: Move acpi_disabled variables into acpi/boot.c
      Clean up acpi_numa variable
      Move e820 map into e820.c
      Add sparse annotation to vsyscall.c
      Add sparse annotations to quiet sparse in arch/x86_64/mm/fault.c
      Fix most sparse warnings in sys_ia32.c
      Fix sparse warnings in compat aout code
      x86: Remove unneeded externs in acpi/boot.c
      x86: Some preparationary cleanup for stack trace
      Avoid recursion in lockdep when stack tracer takes locks
      Don't access the APIC in safe_smp_processor_id when it is not mapped yet
      Move unwind_init earlier
      Merge stacktrace and show_trace
      Check for end of stack trace before falling back
      i386: Do stacktracer conversion too
      i386: Terminate backtrace fallback early if unwinder stack pointer is zero
      i386: Get ebp from unwinder state when continuing fallback backtrace
      Don't force frame pointers for lockdep
      i386/x86-64: Improve Kconfig description of CRASH_DUMP
      Make boot_param_data pure BSS
      i386: Fix warning in mpparse.c
      make fault notifier unconditional and export it
      i386: make fault notifier unconditional and export it
      i386: move kernel_thread_helper into entry.S
      Don't force reserve the 640k-1MB range
      Move compiler check for modules to ia64 only
      Remove safe_smp_processor_id()
      Remove bogus warning from early_ioremap
      Fix pte_exec/mkexec and use it in change_page_attr()
      Use proper accessors to change PSE bits in change_page_attr()
      Remove APIC version/cpu capability mpparse checking/printing
      Remove some cruft in apic id checking during processor setup
      Fix coding style and output of the mptable parser
      Add a missing check for irq flags tracing in NMI
      Remove non e820 fallbacks in high level code
      optimize hweight64 for x86_64
      x86: Remove incorrect comment about ACPI e820 entries
      Optimize PDA accesses slightly
      Don't use kernel_text_address in oops context
      Document my tree in Documentation/HOWTO
      Fix a irqcount comment in entry.S
      Use %c instead of %P modifier in pda access
      Fix a PDA warning uncovered by the new type checking
      Fix zeroing on exception in copy_*_user
      Add __must_check to copy_*_user
      Check return value of copy_to_user in compat_sys_pselect7
      Check return values of __copy_to_user in uname emulation
      Fix some stylistic issues in uaccess.h
      Reindent macros in pda.h
      Define __bad_pda_field as noreturn
      Remove unused asm-x86_64/mmx.h
      Mark per cpu data initialization __initdata again
      Fix idle notifiers
      i386/x86-64: PCI: split probing and initialization of type 1 config space access
      i386/x86-64: Only do MCFG e820 check when type 1 works
      i386: Add MMCFG resources to i386 too
      Use string instructions for Core2 copy/clear
      Remove outdated comment in x86-64 mmconfig code
      Don't synchronize time reading on single core AMD systems
      Remove all traces of signal number conversion
      Initialize argument registers for 32bit signal handlers.
      Fix some broken white space in ia32_signal.c
      Don't leak NT bit into next task
      i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
      x86: Move direct PCI scanning functions out of line
      x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
      Fix unwinder warning in traps.c
      Don't set calgary iommu as default y

Andrew Morton:
      wire up oops_enter()/oops_exit()
      make numa_emulation() __init

Arjan van de Ven:
      non lazy "sleazy" fpu implementation
      Add comments to the PDA structure to annotate offsets
      Add the Kconfig option for the stackprotector feature
      Add the canary field to the PDA area and the task struct
      Add the __stack_chk_fail() function
      Add the -fstack-protector option to the CFLAGS

Ashok Raj:
      i386: Support physical cpu hotplug for x86_64

Brice Goglin:
      fix bus numbering format in mmconfig warning

Chuck Ebbert:
      fix is_at_popf() for compat tasks
      remove lock prefix from is_at_popf() tests
      i386/x86-64: rename is_at_popf(), add iret to tests and fix
      i386: annotate FIX_STACK() and the rest of nmi()
      i386: Do better early exception handlers

Dave Jones:
      i386: don't taint UP K7's running SMP kernels.
      x86: remove config.h includes from asm-i386 & asm-x86_64
      i386: Split multi-line printk in oops output.
      i386/x86-64: New Intel feature flags

Diego Calleja:
      x86: AUX_DEVICE_INFO is one byte long, use 'movb'

Dimitri Sivanich:
      X86_64 monotonic_clock goes backwards

Dmitriy Zavin:
      Add 64bit jiffies compares (for use with get_jiffies_64)
      x86: Refactor thermal throttle processing
      i386: Make the jiffies compares use the 64bit safe macros.
      x86: Add a cumulative thermal throttle event counter.

Don Zickus:
      x86: Add performance counter reservation framework for UP kernels
      i386: Utilize performance counter reservation framework in oprofile
      Add SMP support on x86_64 to reservation framework
      i386: Add SMP support on i386 to reservation framework
      x86: Cleanup NMI interrupt path
      i386/x86-64: Remove un/set_nmi_callback and reserve/release_lapic_nmi functions
      x86: Add abilty to enable/disable nmi watchdog with sysctl
      x86: Add abilty to enable/disable nmi watchdog from procfs (update)
      x86: Allow users to force a panic on NMI
      x86: x86 clean up nmi panic messages

Eric W. Biederman:
      Fix gdt table size in trampoline.S
      Auto size the per cpu area.
      Reload CS when startup_64 is used.
      i386: Remove experimental mark of kexec
      Remove experimental mark of kexec

Fernando Luis Vázquez Cao:
      Replace local_save_flags+local_irq_disable with
      i386: Disallow kprobes on NMI handlers
      i386: Disallow kprobes on NMI handlers

H. Peter Anvin:
      i386: Fix the EDD code misparsing the command line

Ian Campbell:
      Put .note.* sections into a PT_NOTE segment

Jan Beulich:
      initialize end of memory variables as early as possible
      remove int_delivery_dest
      i386: initialize end-of-memory variables as early as possible
      annotate arch/x86_64/lib/*.S
      i386/x86-64: Work around gcc bug with noreturn functions in unwinder

Jeremy Fitzhardinge:
      i386: fix dubious segment register clear in cpu_init()
      Type checking for write_pda()
      i386: Fix pack_descriptor()

Keith Mannthey:
      x86_64 kernel mapping fix

Keith Owens:
      Remove most of the special cases for the debug IST stack

Magnus Damm:
      i386: clean up topology.c
      i386: mark two more functions as __init
      i386: remove redundant generic_identify() calls when identifying cpus
      mark init_amd() as __cpuinit
      i386: mark cpu_dev structures as __cpuinitdata
      i386: mark cpu init functions as __cpuinit, data as __cpuinitdata
      i386: mark cpu identify functions as __cpuinit
      i386: mark cpu cache functions as __cpuinit
      Avoid overwriting the current pgd (V4, x86_64)
      i386: Avoid overwriting the current pgd (V4, i386)

Matthew Garrett:
      x86: - restore i8259A eoi status on resume

Muli Ben-Yehuda:
      Calgary IOMMU: rearrange 'struct iommu_table' members
      Calgary IOMMU: consolidate per bus data structures
      Calgary IOMMU: break out of pci_find_device_reverse if dev not found
      Calgary IOMMU: fix error path memleak in calgary_free_tar
      Calgary IOMMU: fix reference counting of Calgary PCI devices
      Calgary IOMMU: calgary_init_one_nontraslated() can return void
      Calgary IOMMU: save a bit of space in bus_info
      remove superflous BUG_ON's in nommu and gart
      print whether CONFIG_IOMMU_DEBUG is enabled
      only verify the allocation bitmap if CONFIG_IOMMU_DEBUG is on
      remove tce_cache_blast_stress()
      Calgary IOMMU: eradicate sole remaining 80 chars per line offender

Paolo 'Blaisorblade' Giarrusso:
      Fix boot code head.S warning

Prasanna S.P:
      x86: error_code is not safe for kprobes

Rafael J. Wysocki:
      Detect clock skew during suspend

Rusty Russell:
      Allow early_param and identical __setup to exist
      i386: Replace i386 open-coded cmdline parsing with
      i386: Descriptor and trap table cleanups.
      i386: Abstract sensitive instructions
      i386: Allow a kernel not to be in ring 0

Shaohua Li:
      i386/x86-64: Fix NMI watchdog suspend/resume

Stephane Eranian:
      x86-64 TIF flags for debug regs and io bitmap in ctxsw

Venkatesh Pallipadi:
      x86: i386/x86-64 Add nmi watchdog support for new Intel CPUs

Vivek Goyal:
      kdump x86_64 nmi event notification fix
      i386: Kdump i386 nmi event notification fix

Vojtech Pavlik:
      Add macros for rdtscp
      Add initalization of the RDTSCP auxilliary values
      Add the vgetcpu vsyscall

 arch/i386/kernel/semaphore.c              |  134 ---
 arch/i386/kernel/stacktrace.c             |   93 --
 include/asm-i386/intel_arch_perfmon.h     |   19 
 include/asm-x86_64/intel_arch_perfmon.h   |   19 
 include/asm-x86_64/mmx.h                  |   14 
 Documentation/HOWTO                       |    3 
 Documentation/filesystems/proc.txt        |   14 
 Documentation/kbuild/makefiles.txt        |    5 
 Documentation/kernel-parameters.txt       |    6 
 Documentation/x86_64/boot-options.txt     |    7 
 Documentation/x86_64/kernel-stacks        |   99 ++
 arch/i386/Kconfig                         |   17 
 arch/i386/Makefile                        |    8 
 arch/i386/boot/edd.S                      |   97 +-
 arch/i386/boot/setup.S                    |    4 
 arch/i386/defconfig                       | 1063 +++++++++++++---------------
 arch/i386/kernel/Makefile                 |    3 
 arch/i386/kernel/acpi/Makefile            |    2 
 arch/i386/kernel/acpi/boot.c              |  183 ++++
 arch/i386/kernel/acpi/earlyquirk.c        |    6 
 arch/i386/kernel/apic.c                   |   31 
 arch/i386/kernel/cpu/amd.c                |    7 
 arch/i386/kernel/cpu/centaur.c            |   24 
 arch/i386/kernel/cpu/common.c             |    8 
 arch/i386/kernel/cpu/cpu.h                |    2 
 arch/i386/kernel/cpu/cyrix.c              |   42 -
 arch/i386/kernel/cpu/intel.c              |    3 
 arch/i386/kernel/cpu/mcheck/Makefile      |    2 
 arch/i386/kernel/cpu/mcheck/p4.c          |   26 
 arch/i386/kernel/cpu/mcheck/therm_throt.c |  198 ++++-
 arch/i386/kernel/cpu/nexgen.c             |    9 
 arch/i386/kernel/cpu/proc.c               |    4 
 arch/i386/kernel/cpu/rise.c               |    4 
 arch/i386/kernel/cpu/transmeta.c          |    7 
 arch/i386/kernel/cpu/umc.c                |    7 
 arch/i386/kernel/crash.c                  |   24 
 arch/i386/kernel/entry.S                  |  110 +-
 arch/i386/kernel/head.S                   |   67 +
 arch/i386/kernel/i8259.c                  |    6 
 arch/i386/kernel/io_apic.c                |  125 +--
 arch/i386/kernel/machine_kexec.c          |  140 +--
 arch/i386/kernel/mca.c                    |    8 
 arch/i386/kernel/mpparse.c                |   70 -
 arch/i386/kernel/nmi.c                    | 1138 +++++++++++++++++++-----------
 arch/i386/kernel/process.c                |   14 
 arch/i386/kernel/ptrace.c                 |   10 
 arch/i386/kernel/relocate_kernel.S        |  162 +++-
 arch/i386/kernel/setup.c                  |  367 +++------
 arch/i386/kernel/smpboot.c                |   19 
 arch/i386/kernel/stacktrace.c             |   11 
 arch/i386/kernel/syscall_table.S          |    1 
 arch/i386/kernel/time.c                   |   23 
 arch/i386/kernel/topology.c               |   21 
 arch/i386/kernel/traps.c                  |  246 +++---
 arch/i386/kernel/tsc.c                    |    2 
 arch/i386/lib/Makefile                    |    2 
 arch/i386/lib/semaphore.S                 |  217 +++++
 arch/i386/mach-generic/bigsmp.c           |    1 
 arch/i386/mach-generic/es7000.c           |    1 
 arch/i386/mach-generic/probe.c            |   60 -
 arch/i386/mach-generic/summit.c           |    1 
 arch/i386/mm/discontig.c                  |    5 
 arch/i386/mm/extable.c                    |    2 
 arch/i386/mm/fault.c                      |   25 
 arch/i386/mm/highmem.c                    |    2 
 arch/i386/mm/init.c                       |   38 -
 arch/i386/oprofile/nmi_int.c              |   92 +-
 arch/i386/oprofile/nmi_timer_int.c        |   41 -
 arch/i386/oprofile/op_model_athlon.c      |   54 +
 arch/i386/oprofile/op_model_p4.c          |  152 +---
 arch/i386/oprofile/op_model_ppro.c        |   65 +
 arch/i386/oprofile/op_x86_model.h         |    1 
 arch/i386/pci/Makefile                    |    2 
 arch/i386/pci/common.c                    |    4 
 arch/i386/pci/direct.c                    |   25 
 arch/i386/pci/early.c                     |   52 +
 arch/i386/pci/init.c                      |    9 
 arch/i386/pci/mmconfig.c                  |   41 +
 arch/i386/pci/pci.h                       |    7 
 arch/s390/kernel/stacktrace.c             |   17 
 arch/um/sys-i386/Makefile                 |    2 
 arch/x86_64/Kconfig                       |   40 -
 arch/x86_64/Makefile                      |   10 
 arch/x86_64/boot/compressed/Makefile      |    3 
 arch/x86_64/boot/setup.S                  |    4 
 arch/x86_64/defconfig                     |  109 ++
 arch/x86_64/ia32/ia32_aout.c              |    8 
 arch/x86_64/ia32/ia32_signal.c            |   53 -
 arch/x86_64/ia32/ia32entry.S              |    9 
 arch/x86_64/ia32/ptrace32.c               |   10 
 arch/x86_64/ia32/sys_ia32.c               |   52 -
 arch/x86_64/kernel/Makefile               |   13 
 arch/x86_64/kernel/aperture.c             |   25 
 arch/x86_64/kernel/apic.c                 |  231 ++----
 arch/x86_64/kernel/crash.c                |   28 
 arch/x86_64/kernel/e820.c                 |  118 +--
 arch/x86_64/kernel/early-quirks.c         |  122 +++
 arch/x86_64/kernel/early_printk.c         |   20 
 arch/x86_64/kernel/entry.S                |   63 +
 arch/x86_64/kernel/genapic_cluster.c      |    1 
 arch/x86_64/kernel/genapic_flat.c         |    5 
 arch/x86_64/kernel/head.S                 |   15 
 arch/x86_64/kernel/head64.c               |   44 -
 arch/x86_64/kernel/i8259.c                |   15 
 arch/x86_64/kernel/io_apic.c              |  486 +-----------
 arch/x86_64/kernel/ioport.c               |    1 
 arch/x86_64/kernel/irq.c                  |   12 
 arch/x86_64/kernel/machine_kexec.c        |   99 +-
 arch/x86_64/kernel/mce.c                  |   29 
 arch/x86_64/kernel/mce_intel.c            |   30 
 arch/x86_64/kernel/mpparse.c              |  238 +-----
 arch/x86_64/kernel/nmi.c                  | 1050 +++++++++++++++++----------
 arch/x86_64/kernel/pci-calgary.c          |  158 ++--
 arch/x86_64/kernel/pci-dma.c              |    7 
 arch/x86_64/kernel/pci-gart.c             |    3 
 arch/x86_64/kernel/pci-nommu.c            |    1 
 arch/x86_64/kernel/process.c              |  110 +-
 arch/x86_64/kernel/ptrace.c               |   29 
 arch/x86_64/kernel/relocate_kernel.S      |  171 ++++
 arch/x86_64/kernel/setup.c                |  243 +-----
 arch/x86_64/kernel/setup64.c              |   45 -
 arch/x86_64/kernel/signal.c               |   87 --
 arch/x86_64/kernel/smp.c                  |   25 
 arch/x86_64/kernel/smpboot.c              |   16 
 arch/x86_64/kernel/stacktrace.c           |  228 ------
 arch/x86_64/kernel/tce.c                  |   12 
 arch/x86_64/kernel/time.c                 |  110 +-
 arch/x86_64/kernel/trampoline.S           |    2 
 arch/x86_64/kernel/traps.c                |  208 +++--
 arch/x86_64/kernel/vmlinux.lds.S          |   25 
 arch/x86_64/kernel/vsmp.c                 |    3 
 arch/x86_64/kernel/vsyscall.c             |   98 ++
 arch/x86_64/kernel/x8664_ksyms.c          |    1 
 arch/x86_64/lib/Makefile                  |    2 
 arch/x86_64/lib/clear_page.S              |   47 -
 arch/x86_64/lib/copy_page.S               |   53 -
 arch/x86_64/lib/copy_user.S               |  163 ++--
 arch/x86_64/lib/csum-copy.S               |   26 
 arch/x86_64/lib/getuser.S                 |   32 
 arch/x86_64/lib/iomap_copy.S              |   10 
 arch/x86_64/lib/memcpy.S                  |   69 +
 arch/x86_64/lib/memset.S                  |   79 +-
 arch/x86_64/lib/putuser.S                 |   32 
 arch/x86_64/lib/rwlock.S                  |   38 +
 arch/x86_64/lib/thunk.S                   |   43 -
 arch/x86_64/mm/fault.c                    |   22 
 arch/x86_64/mm/init.c                     |   58 -
 arch/x86_64/mm/k8topology.c               |    3 
 arch/x86_64/mm/numa.c                     |   11 
 arch/x86_64/mm/pageattr.c                 |   24 
 arch/x86_64/mm/srat.c                     |    2 
 arch/x86_64/pci/Makefile                  |    3 
 arch/x86_64/pci/mmconfig.c                |   44 +
 drivers/char/hpet.c                       |    4 
 drivers/pci/pci.c                         |    5 
 fs/binfmt_elf.c                           |    3 
 fs/compat.c                               |    5 
 include/asm-i386/acpi.h                   |   14 
 include/asm-i386/alternative-asm.i        |   14 
 include/asm-i386/apic.h                   |   16 
 include/asm-i386/desc.h                   |  123 ++-
 include/asm-i386/dwarf2.h                 |   11 
 include/asm-i386/e820.h                   |    2 
 include/asm-i386/frame.i                  |   24 
 include/asm-i386/genapic.h                |   69 +
 include/asm-i386/intel_arch_perfmon.h     |   31 
 include/asm-i386/io_apic.h                |   11 
 include/asm-i386/kexec.h                  |   27 
 include/asm-i386/mach-es7000/mach_apic.h  |    4 
 include/asm-i386/mach-summit/mach_apic.h  |   11 
 include/asm-i386/mutex.h                  |   16 
 include/asm-i386/nmi.h                    |   37 
 include/asm-i386/pgtable.h                |    2 
 include/asm-i386/ptrace.h                 |    9 
 include/asm-i386/rwlock.h                 |   52 -
 include/asm-i386/rwsem.h                  |   62 -
 include/asm-i386/segment.h                |   17 
 include/asm-i386/semaphore.h              |   49 -
 include/asm-i386/smp.h                    |   20 
 include/asm-i386/spinlock.h               |  138 +--
 include/asm-i386/stacktrace.h             |    1 
 include/asm-i386/therm_throt.h            |    9 
 include/asm-i386/tlbflush.h               |    4 
 include/asm-i386/tsc.h                    |    1 
 include/asm-i386/unistd.h                 |    3 
 include/asm-i386/unwind.h                 |    8 
 include/asm-ia64/module.h                 |    3 
 include/asm-um/alternative-asm.i          |    6 
 include/asm-um/frame.i                    |    6 
 include/asm-x86_64/acpi.h                 |    2 
 include/asm-x86_64/alternative-asm.i      |   14 
 include/asm-x86_64/apic.h                 |    9 
 include/asm-x86_64/bitops.h               |    2 
 include/asm-x86_64/calgary.h              |    7 
 include/asm-x86_64/dwarf2.h               |    8 
 include/asm-x86_64/e820.h                 |    9 
 include/asm-x86_64/fixmap.h               |    4 
 include/asm-x86_64/genapic.h              |    1 
 include/asm-x86_64/i387.h                 |    9 
 include/asm-x86_64/intel_arch_perfmon.h   |   31 
 include/asm-x86_64/io_apic.h              |    6 
 include/asm-x86_64/irq.h                  |    2 
 include/asm-x86_64/kexec.h                |   29 
 include/asm-x86_64/linkage.h              |    2 
 include/asm-x86_64/mach_apic.h            |    1 
 include/asm-x86_64/mce.h                  |    2 
 include/asm-x86_64/mpspec.h               |   11 
 include/asm-x86_64/msr.h                  |   11 
 include/asm-x86_64/mutex.h                |   20 
 include/asm-x86_64/nmi.h                  |   46 -
 include/asm-x86_64/pci-direct.h           |   44 -
 include/asm-x86_64/pda.h                  |  171 ++--
 include/asm-x86_64/percpu.h               |   10 
 include/asm-x86_64/pgtable.h              |    8 
 include/asm-x86_64/proto.h                |   15 
 include/asm-x86_64/rwlock.h               |   82 --
 include/asm-x86_64/segment.h              |    5 
 include/asm-x86_64/semaphore.h            |   40 -
 include/asm-x86_64/signal.h               |    4 
 include/asm-x86_64/smp.h                  |   31 
 include/asm-x86_64/spinlock.h             |   91 +-
 include/asm-x86_64/stacktrace.h           |   18 
 include/asm-x86_64/system.h               |    5 
 include/asm-x86_64/tce.h                  |    1 
 include/asm-x86_64/therm_throt.h          |    1 
 include/asm-x86_64/thread_info.h          |    9 
 include/asm-x86_64/tlbflush.h             |   70 -
 include/asm-x86_64/uaccess.h              |   72 +
 include/asm-x86_64/unistd.h               |    5 
 include/asm-x86_64/unwind.h               |    9 
 include/asm-x86_64/vsyscall.h             |    9 
 include/linux/edd.h                       |    1 
 include/linux/getcpu.h                    |   16 
 include/linux/jiffies.h                   |   15 
 include/linux/kernel.h                    |    1 
 include/linux/linkage.h                   |    6 
 include/linux/sched.h                     |   14 
 include/linux/stacktrace.h                |    7 
 include/linux/syscalls.h                  |    2 
 include/linux/sysctl.h                    |    2 
 include/linux/vermagic.h                  |    4 
 init/main.c                               |   14 
 kernel/fork.c                             |    5 
 kernel/lockdep.c                          |    9 
 kernel/panic.c                            |   13 
 kernel/spinlock.c                         |    5 
 kernel/sys.c                              |   31 
 kernel/sysctl.c                           |   23 
 kernel/unwind.c                           |   35 
 lib/Kconfig.debug                         |    2 
 lib/hweight.c                             |   10 
 scripts/Kbuild.include                    |   11 
 scripts/gcc-x86_64-has-stack-protector.sh |    6 
 253 files changed, 7258 insertions(+), 5655 deletions(-)

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 10:44 x86/x86-64 merge for 2.6.19 Andi Kleen
@ 2006-09-26 19:48 ` Linus Torvalds
  2006-09-26 20:02   ` Andi Kleen
  2006-09-27  5:41 ` Andrew Morton
  1 sibling, 1 reply; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 19:48 UTC (permalink / raw)
  To: Andi Kleen; +Cc: linux-kernel, discuss

On Tue, 26 Sep 2006, Andi Kleen wrote:
> 
> Please pull 'for-linus' from
> 	
> 	http://one.firstfloor.org/home/andi/git/linus-2.6

I really don't want do http:// pulls - they are very inefficient, and I 
don't trust the end result because the http protocol isn't really good for 
verifying the end result (same goes for rsync:// to an even bigger 
degree). 

The native git protocol is not just more efficient, it's fundamentally 
designed to be safe (ie everything is purely based on the actual data 
coming down the line - there's no possibility for any hashed object 
corruption, because the receiving side doesn't even care about the SHA1 
names of the data it receives - it will re-compute them).

So please put them on some machine that has either anonymous native git 
access ("git-daemon") or that I can ssh into. I can either just send 
people my ssh key, but I actually prefer avoiding that, and instead just 
have developers use one of the machines that people share ssh access to as 
a meeting point (ie most people use "master.kernel.org" because they 
already had accounts on that machine - if you don't want to actually 
export the tree to the mirrors, just put it in your own home directory and 
make sure I can get read (and execute, for directories) rights to the 
repository.

Thanks,

		Linus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 19:48 ` Linus Torvalds
@ 2006-09-26 20:02   ` Andi Kleen
  2006-09-26 20:19     ` Linus Torvalds
  0 siblings, 1 reply; 17+ messages in thread
From: Andi Kleen @ 2006-09-26 20:02 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, discuss

On Tuesday 26 September 2006 21:48, Linus Torvalds wrote:
> 
> On Tue, 26 Sep 2006, Andi Kleen wrote:
> > 
> > Please pull 'for-linus' from
> > 	
> > 	http://one.firstfloor.org/home/andi/git/linus-2.6
> 
> I really don't want do http:// pulls - they are very inefficient, and I 
> don't trust the end result because the http protocol isn't really good for 
> verifying the end result (same goes for rsync:// to an even bigger 
> degree). 

Sorry that was actually me typoing (my fingers are not used to git:// urls
yet) I've sent you a new email with correct URL

-Andi

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:02   ` Andi Kleen
@ 2006-09-26 20:19     ` Linus Torvalds
  2006-09-26 20:26       ` Andi Kleen
  0 siblings, 1 reply; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 20:19 UTC (permalink / raw)
  To: Andi Kleen; +Cc: linux-kernel, discuss



On Tue, 26 Sep 2006, Andi Kleen wrote:
> > 
> > I really don't want do http:// pulls - they are very inefficient, and I 
> > don't trust the end result because the http protocol isn't really good for 
> > verifying the end result (same goes for rsync:// to an even bigger 
> > degree). 
> 
> Sorry that was actually me typoing (my fingers are not used to git:// urls
> yet) I've sent you a new email with correct URL

I actually tried it with "git://" instead of "http://" bit maybe I typoed 
too.

Anyway, the new address was fine. Pulled, pushed out.

(Side note, I'm hoping we can sync up more easily now, and in smaller 
chunks ;)

		Linus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:19     ` Linus Torvalds
@ 2006-09-26 20:26       ` Andi Kleen
  2006-09-26 20:44         ` Linus Torvalds
  2006-09-27  6:04         ` Jan Engelhardt
  0 siblings, 2 replies; 17+ messages in thread
From: Andi Kleen @ 2006-09-26 20:26 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, discuss

On Tuesday 26 September 2006 22:19, Linus Torvalds wrote:
> 
> On Tue, 26 Sep 2006, Andi Kleen wrote:
> > > 
> > > I really don't want do http:// pulls - they are very inefficient, and I 
> > > don't trust the end result because the http protocol isn't really good for 
> > > verifying the end result (same goes for rsync:// to an even bigger 
> > > degree). 
> > 
> > Sorry that was actually me typoing (my fingers are not used to git:// urls
> > yet) I've sent you a new email with correct URL
> 
> I actually tried it with "git://" instead of "http://" bit maybe I typoed 
> too.

Yes I managed to typo twice  (linus-2.6 instead of linux-2.6)
Amazing, wasn't it?
 
> Anyway, the new address was fine. Pulled, pushed out.

Thanks.
 
> (Side note, I'm hoping we can sync up more easily now, and in smaller 
> chunks ;)

Yes that is why I did it. I still use quilt for my tree because it works
best for me, but together with all the i386 stuff I was over 230 patches
and email clearly didn't scale well to that much.

-Andi


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:26       ` Andi Kleen
@ 2006-09-26 20:44         ` Linus Torvalds
  2006-09-26 21:23           ` [discuss] " Andi Kleen
                             ` (2 more replies)
  2006-09-27  6:04         ` Jan Engelhardt
  1 sibling, 3 replies; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 20:44 UTC (permalink / raw)
  To: Andi Kleen; +Cc: linux-kernel, discuss

On Tue, 26 Sep 2006, Andi Kleen wrote:
> 
> Yes that is why I did it. I still use quilt for my tree because it works
> best for me, but together with all the i386 stuff I was over 230 patches
> and email clearly didn't scale well to that much.

Right. I'm actually surprised not more peole use git that way. It was 
literally one of the _design_goals_ of git to have people use quilt a a 
more "willy-nilly" front-end process, with git giving the true distributed 
nature that you can't get from that kind of softer patch-queue like 
system.

We discussed some quilt integration stuff, but nobody actually ended up 
ever using both (except indirectly, as with the whole Andrew->Linus 
stage). StGit kind of comes closest.

So I don't think your usage should be considered to be even strange. I 
think it makes sense. I just think that everybody agrees that if we can do 
it in chunks of a few tens of patches most of the time instead of chunks 
of 225, everybody will have an easier time, if only because the latency 
goes down, and it's just easier to react.

That said, the merges with Andrew are also sometimes in the 150+ patch 
range, and merging with other git trees can sometimes bring in even more. 
So I'm not claiming any hard limits or anything like that, just that in 
general it's nicer to get updates trickle in over time rather than all at 
once.

I suspect this was mostly a one-time startup-event.

			Linus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [discuss] Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:44         ` Linus Torvalds
@ 2006-09-26 21:23           ` Andi Kleen
  2006-09-26 21:39             ` Linus Torvalds
  2006-09-26 21:25           ` Paolo Ciarrocchi
  2006-09-26 22:04           ` Sam Ravnborg
  2 siblings, 1 reply; 17+ messages in thread
From: Andi Kleen @ 2006-09-26 21:23 UTC (permalink / raw)
  To: discuss; +Cc: Linus Torvalds, linux-kernel

> 
> That said, the merges with Andrew are also sometimes in the 150+ patch 
> range, and merging with other git trees can sometimes bring in even more. 
> So I'm not claiming any hard limits or anything like that, just that in 
> general it's nicer to get updates trickle in over time rather than all at 
> once.
> 
> I suspect this was mostly a one-time startup-event.

It accumulated a bit because the .18 cycle was relatively long
(and i also did more patches that usual myself, but most of that
was just cleanup and general janitor work) 

I normally do the main bulk the two week merge window and only important
stuff afterwards (usually two or three smaller merges with more stuff
and then only critical bug fixes in small batches until release). 

You want merges more often or more spaced out?

I currently planned to do better spaced out posting for review
at least (to not overwhelm the various mailing lists). It would
be possible to do the merge towards you shortly after that when
patches cooked a bit in -mm*. But it won't follow the two week window
all that much.

-Andi

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:44         ` Linus Torvalds
  2006-09-26 21:23           ` [discuss] " Andi Kleen
@ 2006-09-26 21:25           ` Paolo Ciarrocchi
  2006-09-26 21:43             ` Linus Torvalds
  2006-09-26 22:04           ` Sam Ravnborg
  2 siblings, 1 reply; 17+ messages in thread
From: Paolo Ciarrocchi @ 2006-09-26 21:25 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel

On 9/26/06, Linus Torvalds <torvalds@osdl.org> wrote:
>
>
> On Tue, 26 Sep 2006, Andi Kleen wrote:
> >
> > Yes that is why I did it. I still use quilt for my tree because it works
> > best for me, but together with all the i386 stuff I was over 230 patches
> > and email clearly didn't scale well to that much.
>
> Right. I'm actually surprised not more peole use git that way. It was
> literally one of the _design_goals_ of git to have people use quilt a a
> more "willy-nilly" front-end process, with git giving the true distributed
> nature that you can't get from that kind of softer patch-queue like
> system.
>
> We discussed some quilt integration stuff, but nobody actually ended up
> ever using both (except indirectly, as with the whole Andrew->Linus
> stage). StGit kind of comes closest.
>
> So I don't think your usage should be considered to be even strange. I
> think it makes sense. I just think that everybody agrees that if we can do
> it in chunks of a few tens of patches most of the time instead of chunks
> of 225, everybody will have an easier time, if only because the latency
> goes down, and it's just easier to react.
>
> That said, the merges with Andrew are also sometimes in the 150+ patch
> range, and merging with other git trees can sometimes bring in even more.

Linus,
out of curiosity, wouldn't be better to sync with Andrew via git?
Why via plain patches?

What am I missing?

Thanks.

-- 
Paolo
http://paolo.ciarrocchi.googlepages.com
http://picasaweb.google.com/paolo.ciarrocchi

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [discuss] Re: x86/x86-64 merge for 2.6.19
  2006-09-26 21:23           ` [discuss] " Andi Kleen
@ 2006-09-26 21:39             ` Linus Torvalds
  0 siblings, 0 replies; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 21:39 UTC (permalink / raw)
  To: Andi Kleen; +Cc: discuss, linux-kernel



On Tue, 26 Sep 2006, Andi Kleen wrote:
> 
> I normally do the main bulk the two week merge window and only important
> stuff afterwards (usually two or three smaller merges with more stuff
> and then only critical bug fixes in small batches until release). 
> 
> You want merges more often or more spaced out?

That sounds fine, let's just see how this firms up. It's not like I've 
really had a lot of "rules" in general, and mostly the merges tend to 
eventually find a pattern that is just convenient for everybody.

		Linus "don't worry, be happy" Torvalds

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 21:25           ` Paolo Ciarrocchi
@ 2006-09-26 21:43             ` Linus Torvalds
  2006-09-27  7:44               ` Rolf Eike Beer
  2006-09-27  8:05               ` Paolo Ciarrocchi
  0 siblings, 2 replies; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 21:43 UTC (permalink / raw)
  To: Paolo Ciarrocchi; +Cc: linux-kernel

On Tue, 26 Sep 2006, Paolo Ciarrocchi wrote:
>
> out of curiosity, wouldn't be better to sync with Andrew via git?
> Why via plain patches?
> 
> What am I missing?

I think you're just missing that we've become so used to it that it's just 
easier than all the alternatives.

Also, the way we do things with Andrew actually has a few advantages over 
a straight git-to-git merge. In particular, when Andrew sends me his 
current stable quilt queue, every email is also Cc'd to the people who 
sent it to him originally or were otherwise involved.

So the very act of transferring the patches from one tree to another 
sometimes produces an extra acknowledgement cycle, and we've had patches 
that got NACK'ed at that point because it was an older version of the 
patch etc.

Now, I suspect this is more of an advantage with Andrew's tree than with 
most other trees (most other trees tend to have a much stricter focus), 
and perhaps equally importantly, it also wouldn't really work very well if 
_everybody_ did it, so I personally believe this is one of those 
situations where what's good for _one_ case may not actually be wonderful 
for _all_ cases.

I think it's worked out pretty well, no?

			Linus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:44         ` Linus Torvalds
  2006-09-26 21:23           ` [discuss] " Andi Kleen
  2006-09-26 21:25           ` Paolo Ciarrocchi
@ 2006-09-26 22:04           ` Sam Ravnborg
  2006-09-26 22:20             ` Linus Torvalds
  2 siblings, 1 reply; 17+ messages in thread
From: Sam Ravnborg @ 2006-09-26 22:04 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andi Kleen, linux-kernel, discuss

On Tue, Sep 26, 2006 at 01:44:42PM -0700, Linus Torvalds wrote:
> 
> 
> On Tue, 26 Sep 2006, Andi Kleen wrote:
> > 
> > Yes that is why I did it. I still use quilt for my tree because it works
> > best for me, but together with all the i386 stuff I was over 230 patches
> > and email clearly didn't scale well to that much.
> 
> Right. I'm actually surprised not more peole use git that way. It was 
> literally one of the _design_goals_ of git to have people use quilt a a 
> more "willy-nilly" front-end process, with git giving the true distributed 
> nature that you can't get from that kind of softer patch-queue like 
> system.

One of the major benefits from git is that whenever I decide to
do some changes git allows me to start modifying as I like and when
done I just do "git diff | less" to review it. And when it turns out to be a piece of crap I just do "git reset --hard" and be done with it.
This make my life so much easier than having to copy symlinked tress
around all the time - and I then may not touch the base for the symlinks.

Put all other nice and usefull features aside this has been a major
timesaver for me both in the bk days and also now in the git days.
And quilt does not help me in this respect as I understood last I looked.

Using git sometimes does not work out that well for this.
But then I do a simple git format-patch HEAD~nn..HEAD which I apply on top
of a freshly cloned tree and we are back on track. This tricks works for me
since I have only two customers of my kbuild.git tree - akpm and Linus.
Where Linus just pulls into his tree so no problem, and Andrew seems to cope
fine with me doing a fresh tree now and then.

	Sam

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 22:04           ` Sam Ravnborg
@ 2006-09-26 22:20             ` Linus Torvalds
  0 siblings, 0 replies; 17+ messages in thread
From: Linus Torvalds @ 2006-09-26 22:20 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: Andi Kleen, linux-kernel, discuss

On Wed, 27 Sep 2006, Sam Ravnborg wrote:

> On Tue, Sep 26, 2006 at 01:44:42PM -0700, Linus Torvalds wrote:
> >
> > Right. I'm actually surprised not more peole use git that way. It was 
> > literally one of the _design_goals_ of git to have people use quilt a a 
> > more "willy-nilly" front-end process, with git giving the true distributed 
> > nature that you can't get from that kind of softer patch-queue like 
> > system.
> 
> One of the major benefits from git is that whenever I decide to
> do some changes git allows me to start modifying as I like and when
> done I just do "git diff | less" to review it. And when it turns out
> to be a piece of crap I just do "git reset --hard" and be done with it.
> This make my life so much easier than having to copy symlinked tress
> around all the time - and I then may not touch the base for the symlinks.

Yeah, I won't argue against that too much. I'm a pure git user myself, 
although my patterns tend to be different from most other people (only 
fairly small code changes, and mostly merging other peoples code: I end up 
often touching source code more when I do some trivial manual conflict 
resolution than at most other times..)

And yes, making "git diff" as efficient as possible was definitely one of 
the things that I worked on, exactly because it is how I work when I do 
end up working on something: continually reminding myself what the other 
changes I did were..

So "git" should work fine for pretty much any normal development, but a 
patch maintenance system it ain't.

			Linus

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 10:44 x86/x86-64 merge for 2.6.19 Andi Kleen
  2006-09-26 19:48 ` Linus Torvalds
@ 2006-09-27  5:41 ` Andrew Morton
  2006-09-27  7:11   ` [discuss] " Andi Kleen
  1 sibling, 1 reply; 17+ messages in thread
From: Andrew Morton @ 2006-09-27  5:41 UTC (permalink / raw)
  To: Andi Kleen; +Cc: torvalds, linux-kernel, discuss, Jan Beulich

On Tue, 26 Sep 2006 12:44:43 +0200
Andi Kleen <ak@suse.de> wrote:

>       i386: Remove lock section support in semaphore.h

This change turns my x86_32 Vaio into a brick about half a second into
bootup.  Screen goes black and the fan goes all whirry.

It's a bit of a mystery why this well-reported bug was merged, but let us
move on..

If anyone else has similar problems, please test the below backout patch
and report.






From: Andrew Morton <akpm@osdl.org>

This kills my Vaio stone dead: black screen hang a few milliseconds after
entering the kernel.

It works OK on the dual-pIII.  Might be related to CONFIG_SMP=n?

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.18-rc6
# Mon Sep 11 21:51:39 2006
#
CONFIG_X86_32=y
CONFIG_GENERIC_TIME=y
CONFIG_LOCKDEP_SUPPORT=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_DMI=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32

#
# General setup
#
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
# CONFIG_TASKSTATS is not set
CONFIG_SYSCTL=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
# CONFIG_IKCONFIG is not set
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
CONFIG_KALLSYMS_EXTRA_PASS=y
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_RT_MUTEXES=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_SLAB=y
CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
# CONFIG_SLOB is not set

#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_KMOD=y

#
# Block layer
#
CONFIG_BLOCK=y
CONFIG_LBD=y
# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_LSF is not set

#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"

#
# Processor type and features
#
# CONFIG_SMP is not set
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_X86_ES7000 is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not set
# CONFIG_M686 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
CONFIG_MPENTIUMM=y
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MEFFICEON is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_X86_GENERIC is not set
CONFIG_X86_CMPXCHG=y
CONFIG_X86_XADD=y
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_TSC=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
# CONFIG_PREEMPT is not set
CONFIG_X86_UP_APIC=y
CONFIG_X86_UP_IOAPIC=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
CONFIG_X86_MCE_P4THERMAL=y
CONFIG_VM86=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m

#
# Firmware Drivers
#
CONFIG_EDD=m
CONFIG_DELL_RBU=m
CONFIG_DCDBAS=m
# CONFIG_NOHIGHMEM is not set
CONFIG_HIGHMEM4G=y
# CONFIG_HIGHMEM64G is not set
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set
CONFIG_HIGHPTE=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_REGPARM=y
CONFIG_SECCOMP=y
# CONFIG_VGA_NOPROBE is not set
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
CONFIG_KEXEC=y
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x100000
CONFIG_COMPAT_VDSO=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
# CONFIG_PM_LEGACY is not set
CONFIG_PM_DEBUG=y
# CONFIG_PM_TRACE is not set
# CONFIG_PM_SYSFS_DEPRECATED is not set
CONFIG_SOFTWARE_SUSPEND=y
CONFIG_PM_STD_PARTITION="/dev/sda5"

#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y
# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
# CONFIG_ACPI_HOTKEY is not set
CONFIG_ACPI_FAN=y
CONFIG_ACPI_DOCK=y
# CONFIG_ACPI_BAY is not set
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_ASUS=m
CONFIG_ACPI_IBM=m
CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_SONY=m
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
# CONFIG_ACPI_CONTAINER is not set
CONFIG_ACPI_SBS=m

#
# APM (Advanced Power Management) BIOS Support
#
# CONFIG_APM is not set

#
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_DEBUG=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m

#
# CPUFreq processor drivers
#
CONFIG_X86_ACPI_CPUFREQ=m
# CONFIG_X86_POWERNOW_K6 is not set
CONFIG_X86_POWERNOW_K7=y
CONFIG_X86_POWERNOW_K7_ACPI=y
CONFIG_X86_POWERNOW_K8=y
CONFIG_X86_POWERNOW_K8_ACPI=y
# CONFIG_X86_GX_SUSPMOD is not set
CONFIG_X86_SPEEDSTEP_CENTRINO=y
CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
CONFIG_X86_SPEEDSTEP_ICH=y
CONFIG_X86_SPEEDSTEP_SMI=y
CONFIG_X86_P4_CLOCKMOD=m
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
CONFIG_X86_LONGRUN=y
# CONFIG_X86_LONGHAUL is not set

#
# shared options
#
# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
CONFIG_X86_SPEEDSTEP_LIB=y
# CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK is not set

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_MULTITHREAD_PROBE is not set
# CONFIG_PCI_DEBUG is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set

#
# PCCARD (PCMCIA/CardBus) support
#
CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=y
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
CONFIG_CARDBUS=y

#
# PC-card bridges
#
CONFIG_YENTA=y
CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
CONFIG_YENTA_ENE_TUNE=y
CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y

#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI is not set

#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_MISC=y

#
# Networking
#
CONFIG_NET=y

#
# Networking options
#
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
CONFIG_NET_KEY=m
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_ASK_IP_FIB_HASH=y
# CONFIG_IP_FIB_TRIE is not set
CONFIG_IP_FIB_HASH=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_FWMARK=y
CONFIG_IP_ROUTE_MULTIPATH=y
# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE=m
CONFIG_NET_IPGRE_BROADCAST=y
CONFIG_IP_MROUTE=y
CONFIG_IP_PIMSM_V1=y
CONFIG_IP_PIMSM_V2=y
CONFIG_ARPD=y
CONFIG_SYN_COOKIES=y
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
CONFIG_INET_IPCOMP=m
CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INET_TUNNEL=m
CONFIG_INET_XFRM_MODE_TRANSPORT=y
CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
# CONFIG_TCP_CONG_ADVANCED is not set
CONFIG_TCP_CONG_BIC=y

#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_BRIDGE_NETFILTER=y

#
# Core Netfilter Configuration
#
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_NETFILTER_XT_MATCH_DCCP=m
# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HELPER=m
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
CONFIG_NETFILTER_XT_MATCH_MAC=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_CT_ACCT=y
CONFIG_IP_NF_CONNTRACK_MARK=y
# CONFIG_IP_NF_CONNTRACK_SECMARK is not set
CONFIG_IP_NF_CONNTRACK_EVENTS=y
CONFIG_IP_NF_CONNTRACK_NETLINK=m
CONFIG_IP_NF_CT_PROTO_SCTP=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_NETBIOS_NS=m
CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_H323=m
# CONFIG_IP_NF_SIP is not set
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_NAT_PPTP=m
CONFIG_IP_NF_NAT_H323=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_TTL=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m

#
# Bridge: Netfilter Configuration
#
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
CONFIG_BRIDGE_EBT_T_NAT=m
CONFIG_BRIDGE_EBT_802_3=m
CONFIG_BRIDGE_EBT_AMONG=m
CONFIG_BRIDGE_EBT_ARP=m
CONFIG_BRIDGE_EBT_IP=m
CONFIG_BRIDGE_EBT_LIMIT=m
CONFIG_BRIDGE_EBT_MARK=m
CONFIG_BRIDGE_EBT_PKTTYPE=m
CONFIG_BRIDGE_EBT_STP=m
CONFIG_BRIDGE_EBT_VLAN=m
CONFIG_BRIDGE_EBT_ARPREPLY=m
CONFIG_BRIDGE_EBT_DNAT=m
CONFIG_BRIDGE_EBT_MARK_T=m
CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
CONFIG_BRIDGE_EBT_ULOG=m

#
# DCCP Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m
CONFIG_IP_DCCP_ACKVEC=y

#
# DCCP CCIDs Configuration (EXPERIMENTAL)
#
CONFIG_IP_DCCP_CCID2=m
CONFIG_IP_DCCP_CCID3=m
CONFIG_IP_DCCP_TFRC_LIB=m

#
# DCCP Kernel Hacking
#
# CONFIG_IP_DCCP_DEBUG is not set

#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IP_SCTP=m
# CONFIG_SCTP_DBG_MSG is not set
# CONFIG_SCTP_DBG_OBJCNT is not set
# CONFIG_SCTP_HMAC_NONE is not set
# CONFIG_SCTP_HMAC_SHA1 is not set
CONFIG_SCTP_HMAC_MD5=y

#
# TIPC Configuration (EXPERIMENTAL)
#
CONFIG_TIPC=m
CONFIG_TIPC_ADVANCED=y
CONFIG_TIPC_ZONES=3
CONFIG_TIPC_CLUSTERS=1
CONFIG_TIPC_NODES=255
CONFIG_TIPC_SLAVE_NODES=0
CONFIG_TIPC_PORTS=8191
CONFIG_TIPC_LOG=0
# CONFIG_TIPC_DEBUG is not set
# CONFIG_ATM is not set
CONFIG_BRIDGE=m
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
CONFIG_LLC=m
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=y

#
# QoS and/or fair queueing
#
CONFIG_NET_SCHED=y
CONFIG_NET_SCH_CLK_JIFFIES=y
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
# CONFIG_NET_SCH_CLK_CPU is not set

#
# Queueing/Scheduling
#
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_NETEM=m
CONFIG_NET_SCH_INGRESS=m

#
# Classification
#
CONFIG_NET_CLS=y
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
CONFIG_CLS_U32_MARK=y
CONFIG_NET_CLS_RSVP=m
CONFIG_NET_CLS_RSVP6=m
CONFIG_NET_EMATCH=y
CONFIG_NET_EMATCH_STACK=32
CONFIG_NET_EMATCH_CMP=m
CONFIG_NET_EMATCH_NBYTE=m
CONFIG_NET_EMATCH_U32=m
CONFIG_NET_EMATCH_META=m
CONFIG_NET_EMATCH_TEXT=m
# CONFIG_NET_CLS_ACT is not set
CONFIG_NET_CLS_POLICE=y
CONFIG_NET_CLS_IND=y
CONFIG_NET_ESTIMATOR=y

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m

#
# Bluetooth device drivers
#
CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUSB_SCO=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIBTUART=m
CONFIG_BT_HCIVHCI=m
CONFIG_IEEE80211=m
# CONFIG_IEEE80211_DEBUG is not set
CONFIG_IEEE80211_CRYPT_WEP=m
CONFIG_IEEE80211_CRYPT_CCMP=m
CONFIG_IEEE80211_CRYPT_TKIP=m
# CONFIG_IEEE80211_SOFTMAC is not set
CONFIG_WIRELESS_EXT=y
# CONFIG_NETLABEL is not set
CONFIG_FIB_RULES=y

#
# Device Drivers
#

#
# Generic Driver Options
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_SYS_HYPERVISOR is not set

#
# Connector - unified userspace <-> kernelspace linker
#
CONFIG_CONNECTOR=m

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
# CONFIG_PARPORT is not set

#
# Plug and Play support
#
CONFIG_PNP=y
# CONFIG_PNP_DEBUG is not set

#
# Protocols
#
CONFIG_PNPACPI=y

#
# Block devices
#
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_SX8 is not set
CONFIG_BLK_DEV_UB=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_INITRD=y
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
CONFIG_ATA_OVER_ETH=m

#
# ATA/ATAPI/MFM/RLL support
#
CONFIG_IDE=m
CONFIG_BLK_DEV_IDE=m

#
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_IDE_SATA is not set
# CONFIG_BLK_DEV_HD_IDE is not set
CONFIG_BLK_DEV_IDEDISK=m
CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
CONFIG_BLK_DEV_IDEFLOPPY=m
CONFIG_BLK_DEV_IDESCSI=m
# CONFIG_IDE_TASK_IOCTL is not set

#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=m
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=m
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_BLK_DEV_HD is not set

#
# SCSI device support
#
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=y
CONFIG_SCSI_NETLINK=y
# CONFIG_SCSI_TGT is not set
CONFIG_SCSI_PROC_FS=y

#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_BLK_DEV_SR is not set
CONFIG_CHR_DEV_SG=m
# CONFIG_CHR_DEV_SCH is not set

#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y

#
# SCSI Transports
#
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m
# CONFIG_SCSI_SAS_LIBSAS is not set

#
# SCSI low-level drivers
#
# CONFIG_ISCSI_TCP is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AACRAID is not set
# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
# CONFIG_SCSI_AIC79XX is not set
# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_ARCMSR is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
# CONFIG_SCSI_QLA_FC is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set

#
# PCMCIA SCSI adapter support
#
# CONFIG_PCMCIA_AHA152X is not set
# CONFIG_PCMCIA_FDOMAIN is not set
# CONFIG_PCMCIA_NINJA_SCSI is not set
# CONFIG_PCMCIA_QLOGIC is not set
# CONFIG_PCMCIA_SYM53C500 is not set

#
# Serial ATA (prod) and Parallel ATA (experimental) drivers
#
CONFIG_ATA=y
# CONFIG_SATA_AHCI is not set
# CONFIG_SATA_SVW is not set
CONFIG_ATA_PIIX=y
# CONFIG_SATA_MV is not set
# CONFIG_SATA_NV is not set
# CONFIG_PDC_ADMA is not set
# CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_PROMISE is not set
# CONFIG_SATA_SX4 is not set
# CONFIG_SATA_SIL is not set
# CONFIG_SATA_SIL24 is not set
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
# CONFIG_SATA_VITESSE is not set
# CONFIG_PATA_ALI is not set
# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD64X is not set
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5535 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
# CONFIG_ATA_GENERIC is not set
# CONFIG_PATA_HPT366 is not set
# CONFIG_PATA_HPT37X is not set
# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3 is not set
# CONFIG_PATA_IT8172 is not set
# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_JMICRON is not set
# CONFIG_ATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MPIIX is not set
# CONFIG_PATA_OLDPIIX is not set
# CONFIG_PATA_NETCELL is not set
# CONFIG_PATA_NS87410 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
# CONFIG_PATA_PCMCIA is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_QDI is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set

#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set

#
# Fusion MPT device support
#
# CONFIG_FUSION is not set
# CONFIG_FUSION_SPI is not set
# CONFIG_FUSION_FC is not set
# CONFIG_FUSION_SAS is not set

#
# IEEE 1394 (FireWire) support
#
CONFIG_IEEE1394=m

#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
CONFIG_IEEE1394_OUI_DB=y
CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
# CONFIG_IEEE1394_EXPORT_FULL_API is not set

#
# Device Drivers
#
CONFIG_IEEE1394_PCILYNX=m
CONFIG_IEEE1394_OHCI1394=m

#
# Protocol Drivers
#
CONFIG_IEEE1394_VIDEO1394=m
CONFIG_IEEE1394_SBP2=m
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
CONFIG_IEEE1394_ETH1394=m
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m

#
# I2O device support
#
CONFIG_I2O=m
CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
CONFIG_I2O_EXT_ADAPTEC=y
CONFIG_I2O_CONFIG=m
# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
CONFIG_I2O_BUS=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m

#
# Network device support
#
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_BONDING=m
CONFIG_EQUALIZER=m
CONFIG_TUN=m
# CONFIG_NET_SB1000 is not set

#
# ARCnet devices
#
# CONFIG_ARCNET is not set

#
# PHY device support
#
CONFIG_PHYLIB=m

#
# MII PHY device drivers
#
CONFIG_MARVELL_PHY=m
CONFIG_DAVICOM_PHY=m
CONFIG_QSEMI_PHY=m
CONFIG_LXT_PHY=m
CONFIG_CICADA_PHY=m
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_FIXED_PHY is not set

#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set

#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set

#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_QLA3XXX is not set

#
# Ethernet (10000 Mbit)
#
# CONFIG_CHELSIO_T1 is not set
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set
# CONFIG_MYRI10GE is not set

#
# Token Ring devices
#
# CONFIG_TR is not set

#
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
# CONFIG_NET_WIRELESS_RTNETLINK is not set

#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
# CONFIG_PCMCIA_WAVELAN is not set
# CONFIG_PCMCIA_NETWAVE is not set

#
# Wireless 802.11 Frequency Hopping cards support
#
# CONFIG_PCMCIA_RAYCS is not set

#
# Wireless 802.11b ISA/PCI cards support
#
CONFIG_IPW2100=m
CONFIG_IPW2100_MONITOR=y
CONFIG_IPW2100_DEBUG=y
CONFIG_IPW2200=m
# CONFIG_IPW2200_MONITOR is not set
# CONFIG_IPW2200_QOS is not set
CONFIG_IPW2200_DEBUG=y
# CONFIG_AIRO is not set
# CONFIG_HERMES is not set
# CONFIG_ATMEL is not set

#
# Wireless 802.11b Pcmcia/Cardbus cards support
#
# CONFIG_AIRO_CS is not set
# CONFIG_PCMCIA_WL3501 is not set

#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
# CONFIG_PRISM54 is not set
# CONFIG_USB_ZD1201 is not set
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
CONFIG_NET_WIRELESS=y

#
# PCMCIA network device support
#
# CONFIG_NET_PCMCIA is not set

#
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
CONFIG_PPP=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_BSDCOMP is not set
# CONFIG_PPP_MPPE is not set
CONFIG_PPPOE=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLHC=m
CONFIG_SLIP_SMART=y
# CONFIG_SLIP_MODE_SLIP6 is not set
CONFIG_NET_FC=y
# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=y
CONFIG_NETPOLL=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y

#
# ISDN subsystem
#
# CONFIG_ISDN is not set

#
# Telephony Support
#
# CONFIG_PHONE is not set

#
# Input device support
#
CONFIG_INPUT=y
# CONFIG_INPUT_FF_MEMLESS is not set

#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set

#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
# CONFIG_INPUT_WISTRON_BTNS is not set
CONFIG_INPUT_UINPUT=m

#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
CONFIG_GAMEPORT_EMU10K1=m
CONFIG_GAMEPORT_FM801=m

#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_SERIAL_NONSTANDARD=y
# CONFIG_COMPUTONE is not set
# CONFIG_ROCKETPORT is not set
# CONFIG_CYCLADES is not set
# CONFIG_DIGIEPCA is not set
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
# CONFIG_ISI is not set
# CONFIG_SYNCLINK is not set
# CONFIG_SYNCLINKMP is not set
# CONFIG_SYNCLINK_GT is not set
# CONFIG_N_HDLC is not set
# CONFIG_RISCOM8 is not set
# CONFIG_SPECIALIX is not set
# CONFIG_SX is not set
# CONFIG_RIO is not set
# CONFIG_STALDRV is not set
# CONFIG_NOZOMI is not set

#
# Serial drivers
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y

#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_INTEL=y
CONFIG_HW_RANDOM_AMD=y
CONFIG_HW_RANDOM_GEODE=y
CONFIG_HW_RANDOM_VIA=y
CONFIG_NVRAM=m
CONFIG_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
CONFIG_SONYPI=m

#
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
CONFIG_AGP=y
# CONFIG_AGP_ALI is not set
# CONFIG_AGP_ATI is not set
# CONFIG_AGP_AMD is not set
# CONFIG_AGP_AMD64 is not set
CONFIG_AGP_INTEL=y
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not set
CONFIG_DRM=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_R128 is not set
# CONFIG_DRM_RADEON is not set
CONFIG_DRM_I810=m
CONFIG_DRM_I830=m
CONFIG_DRM_I915=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set

#
# PCMCIA character devices
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_CARDMAN_4000 is not set
# CONFIG_CARDMAN_4040 is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
# CONFIG_CS5535_GPIO is not set
CONFIG_RAW_DRIVER=m
CONFIG_MAX_RAW_DEVS=256
CONFIG_HPET=y
# CONFIG_HPET_RTC_IRQ is not set
# CONFIG_HPET_MMAP is not set
CONFIG_HANGCHECK_TIMER=y

#
# TPM devices
#
CONFIG_TCG_TPM=m
# CONFIG_TCG_TIS is not set
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TELCLOCK=y

#
# I2C support
#
CONFIG_I2C=m
CONFIG_I2C_CHARDEV=m

#
# I2C Algorithms
#
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m

#
# I2C Hardware Bus support
#
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
CONFIG_I2C_I801=m
CONFIG_I2C_I810=m
CONFIG_I2C_PIIX4=m
CONFIG_I2C_ISA=m
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
# CONFIG_SCx200_ACB is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VOODOO3 is not set
# CONFIG_I2C_PCA_ISA is not set

#
# Miscellaneous I2C Chip support
#
CONFIG_SENSORS_DS1337=m
CONFIG_SENSORS_DS1374=m
CONFIG_SENSORS_EEPROM=m
CONFIG_SENSORS_PCF8574=m
CONFIG_SENSORS_PCA9539=m
CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_MAX6875=m
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set

#
# SPI support
#
# CONFIG_SPI is not set
# CONFIG_SPI_MASTER is not set

#
# Dallas's 1-wire bus
#
CONFIG_W1=m
CONFIG_W1_CON=y

#
# 1-wire Bus Masters
#
# CONFIG_W1_MASTER_MATROX is not set
# CONFIG_W1_MASTER_DS2490 is not set
# CONFIG_W1_MASTER_DS2482 is not set

#
# 1-wire Slaves
#
# CONFIG_W1_SLAVE_THERM is not set
# CONFIG_W1_SLAVE_SMEM is not set
# CONFIG_W1_SLAVE_DS2433 is not set

#
# Hardware Monitoring support
#
CONFIG_HWMON=m
CONFIG_HWMON_VID=m
# CONFIG_SENSORS_ABITUGURU is not set
CONFIG_SENSORS_ADM1021=m
CONFIG_SENSORS_ADM1025=m
CONFIG_SENSORS_ADM1026=m
CONFIG_SENSORS_ADM1031=m
CONFIG_SENSORS_ADM9240=m
# CONFIG_SENSORS_K8TEMP is not set
CONFIG_SENSORS_ASB100=m
CONFIG_SENSORS_ATXP1=m
CONFIG_SENSORS_DS1621=m
# CONFIG_SENSORS_F71805F is not set
CONFIG_SENSORS_FSCHER=m
CONFIG_SENSORS_FSCPOS=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_LM63=m
CONFIG_SENSORS_LM75=m
CONFIG_SENSORS_LM77=m
CONFIG_SENSORS_LM78=m
CONFIG_SENSORS_LM80=m
CONFIG_SENSORS_LM83=m
CONFIG_SENSORS_LM85=m
CONFIG_SENSORS_LM87=m
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_LM92=m
CONFIG_SENSORS_MAX1619=m
CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_SIS5595=m
CONFIG_SENSORS_SMSC47M1=m
# CONFIG_SENSORS_SMSC47M192 is not set
CONFIG_SENSORS_SMSC47B397=m
CONFIG_SENSORS_VIA686A=m
# CONFIG_SENSORS_VT8231 is not set
CONFIG_SENSORS_W83781D=m
# CONFIG_SENSORS_W83791D is not set
CONFIG_SENSORS_W83792D=m
CONFIG_SENSORS_W83L785TS=m
CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_W83627EHF=m
CONFIG_SENSORS_HDAPS=m
# CONFIG_HWMON_DEBUG_CHIP is not set

#
# Misc devices
#
# CONFIG_IBM_ASM is not set

#
# Multimedia devices
#
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_V4L2=y

#
# Video Capture Adapters
#

#
# Video Capture Adapters
#
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_MEYE is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_CX88 is not set

#
# V4L USB devices
#
# CONFIG_VIDEO_EM28XX is not set
# CONFIG_USB_VICAM is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_QUICKCAM_MESSENGER is not set
# CONFIG_USB_ET61X251 is not set
# CONFIG_VIDEO_OVCAMCHIP is not set
# CONFIG_USB_W9968CF is not set
# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_ZC0301 is not set
# CONFIG_USB_PWC is not set

#
# Radio Adapters
#
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_USB_DSBR is not set

#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set
CONFIG_USB_DABUSB=m

#
# Graphics support
#
CONFIG_FIRMWARE_EDID=y
CONFIG_FB=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ARC is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
CONFIG_FB_VGA16=m
CONFIG_FB_VESA=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
CONFIG_FB_I810=m
CONFIG_FB_I810_GTF=y
CONFIG_FB_I810_I2C=y
CONFIG_FB_INTEL=m
# CONFIG_FB_INTEL_DEBUG is not set
CONFIG_FB_INTEL_I2C=y
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_CYBLA is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_VIRTUAL is not set

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
CONFIG_VIDEO_SELECT=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y

#
# Logo configuration
#
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_DEVICE=y
CONFIG_LCD_CLASS_DEVICE=m
CONFIG_LCD_DEVICE=y

#
# Sound
#
CONFIG_SOUND=m

#
# Advanced Linux Sound Architecture
#
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RTCTIMER=m
CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set

#
# Generic devices
#
CONFIG_SND_MPU401_UART=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_AC97_BUS=m
CONFIG_SND_DUMMY=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
# CONFIG_SND_SERIAL_U16550 is not set
CONFIG_SND_MPU401=m
# CONFIG_SND_AC97_POWER_SAVE is not set

#
# PCI devices
#
# CONFIG_SND_AD1889 is not set
# CONFIG_SND_ALS300 is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_ATIIXP is not set
# CONFIG_SND_ATIIXP_MODEM is not set
# CONFIG_SND_AU8810 is not set
# CONFIG_SND_AU8820 is not set
# CONFIG_SND_AU8830 is not set
# CONFIG_SND_AZT3328 is not set
# CONFIG_SND_BT87X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5535AUDIO is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_GINA20 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_GINA24 is not set
# CONFIG_SND_LAYLA24 is not set
# CONFIG_SND_MONA is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_ECHO3G is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INDIGOIO is not set
# CONFIG_SND_INDIGODJ is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_FM801 is not set
CONFIG_SND_HDA_INTEL=m
# CONFIG_SND_HDSP is not set
# CONFIG_SND_HDSPM is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_PCXHR is not set
# CONFIG_SND_RIPTIDE is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_YMFPCI is not set

#
# USB devices
#
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_USX2Y=m

#
# PCMCIA devices
#
# CONFIG_SND_VXPOCKET is not set
# CONFIG_SND_PDAUDIOCF is not set

#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set

#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
CONFIG_USB_BANDWIDTH=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
# CONFIG_USB_MULTITHREAD_PROBE is not set
# CONFIG_USB_OTG is not set

#
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_SPLIT_ISO=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m

#
# USB Device Class drivers
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m

#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
#

#
# may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_DEBUG is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
# CONFIG_USB_STORAGE_DPCM is not set
# CONFIG_USB_STORAGE_USBAT is not set
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_LIBUSUAL is not set

#
# USB Input Devices
#
CONFIG_USB_HID=y
CONFIG_USB_HIDINPUT=y
# CONFIG_USB_HIDINPUT_POWERBOOK is not set
# CONFIG_HID_FF is not set
CONFIG_USB_HIDDEV=y
CONFIG_USB_AIPTEK=m
CONFIG_USB_WACOM=m
CONFIG_USB_ACECAD=m
CONFIG_USB_KBTAB=m
CONFIG_USB_POWERMATE=m
CONFIG_USB_TOUCHSCREEN=m
CONFIG_USB_TOUCHSCREEN_EGALAX=y
CONFIG_USB_TOUCHSCREEN_PANJIT=y
CONFIG_USB_TOUCHSCREEN_3M=y
CONFIG_USB_TOUCHSCREEN_ITM=y
CONFIG_USB_TOUCHSCREEN_ETURBO=y
CONFIG_USB_TOUCHSCREEN_GUNZE=y
CONFIG_USB_YEALINK=m
CONFIG_USB_XPAD=m
CONFIG_USB_ATI_REMOTE=m
CONFIG_USB_ATI_REMOTE2=m
CONFIG_USB_KEYSPAN_REMOTE=m
CONFIG_USB_APPLETOUCH=m
# CONFIG_USB_TRANCEVIBRATOR is not set

#
# USB Imaging devices
#
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m

#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set
CONFIG_USB_MON=y

#
# USB port drivers
#

#
# USB Serial Converter support
#
# CONFIG_USB_SERIAL is not set

#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
# CONFIG_USB_ADUTUX is not set
CONFIG_USB_AUERSWALD=m
CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_LED=m
# CONFIG_USB_CYPRESS_CY7C63 is not set
CONFIG_USB_CYTHERM=m
# CONFIG_USB_PHIDGET is not set
CONFIG_USB_IDMOUSE=m
CONFIG_USB_APPLEDISPLAY=m
CONFIG_USB_SISUSBVGA=m
# CONFIG_USB_SISUSBVGA_CON is not set
CONFIG_USB_LD=m
CONFIG_USB_TEST=m
# CONFIG_USB_GOTEMP is not set

#
# USB DSL modem support
#

#
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set

#
# MMC/SD Card support
#
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=m
# CONFIG_MMC_SDHCI is not set
CONFIG_MMC_WBSD=m

#
# LED devices
#
# CONFIG_NEW_LEDS is not set

#
# LED drivers
#

#
# LED Triggers
#

#
# InfiniBand support
#
# CONFIG_INFINIBAND is not set

#
# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
#
CONFIG_EDAC=y

#
# Reporting subsystems
#
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_MM_EDAC=y
# CONFIG_EDAC_AMD76X is not set
# CONFIG_EDAC_E7XXX is not set
# CONFIG_EDAC_E752X is not set
# CONFIG_EDAC_I82875P is not set
# CONFIG_EDAC_I82860 is not set
# CONFIG_EDAC_R82600 is not set
CONFIG_EDAC_POLL=y

#
# Real Time Clock
#
# CONFIG_RTC_CLASS is not set

#
# DMA Engine support
#
# CONFIG_DMA_ENGINE is not set

#
# DMA Clients
#

#
# DMA Devices
#

#
# Userspace I/O
#
# CONFIG_UIO is not set

#
# File systems
#
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_QUOTA=y
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
CONFIG_FUSE_FS=m

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_ZISOFS_FS=y
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set

#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
# CONFIG_UFS_DEBUG is not set

#
# Network File Systems
#
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_DIRECTIO=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_WEAK_PW_HASH is not set
CONFIG_CIFS_XATTR=y
CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
# CONFIG_9P_FS is not set

#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
# CONFIG_MAC_PARTITION is not set
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
CONFIG_MINIX_SUBPARTITION=y
CONFIG_SOLARIS_X86_PARTITION=y
CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_LDM_PARTITION is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set

#
# Native Language Support
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
CONFIG_NLS_CODEPAGE_852=m
CONFIG_NLS_CODEPAGE_855=m
CONFIG_NLS_CODEPAGE_857=m
CONFIG_NLS_CODEPAGE_860=m
CONFIG_NLS_CODEPAGE_861=m
CONFIG_NLS_CODEPAGE_862=m
CONFIG_NLS_CODEPAGE_863=m
CONFIG_NLS_CODEPAGE_864=m
CONFIG_NLS_CODEPAGE_865=m
CONFIG_NLS_CODEPAGE_866=m
CONFIG_NLS_CODEPAGE_869=m
CONFIG_NLS_CODEPAGE_936=m
CONFIG_NLS_CODEPAGE_950=m
CONFIG_NLS_CODEPAGE_932=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_874=m
CONFIG_NLS_ISO8859_8=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m
CONFIG_NLS_ISO8859_5=m
CONFIG_NLS_ISO8859_6=m
CONFIG_NLS_ISO8859_7=m
CONFIG_NLS_ISO8859_9=m
CONFIG_NLS_ISO8859_13=m
CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=m

#
# Distributed Lock Manager
#
# CONFIG_DLM is not set

#
# Instrumentation Support
#
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
# CONFIG_KPROBES is not set

#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
CONFIG_DEBUG_RT_MUTEXES=y
CONFIG_DEBUG_PI_LIST=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_HIGHMEM is not set
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
# CONFIG_DEBUG_VM is not set
# CONFIG_FRAME_POINTER is not set
CONFIG_UNWIND_INFO=y
# CONFIG_STACK_UNWIND is not set
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set

#
# Page alloc debug is incompatible with Software Suspend on i386
#
# CONFIG_DEBUG_RODATA is not set
CONFIG_4KSTACKS=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_DOUBLEFAULT=y

#
# Security options
#
CONFIG_KEYS=y
CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_SECURITY_SECLVL is not set
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
CONFIG_SECURITY_SELINUX_DISABLE=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set

#
# Cryptographic options
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_ARC4=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m
# CONFIG_CRYPTO_TEST is not set

#
# Hardware crypto devices
#
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=y
# CONFIG_CRYPTO_DEV_GEODE is not set

#
# Library routines
#
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=m
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_KTIME_SCALAR=y

Cc: Andi Kleen <ak@suse.de>
Cc: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/lib/semaphore.S    |   63 ---------------------------------
 include/asm-i386/mutex.h     |   16 ++++++--
 include/asm-i386/rwsem.h     |   62 ++++++++++++++++++++++++++------
 include/asm-i386/semaphore.h |   49 ++++++++++++++++---------
 4 files changed, 94 insertions(+), 96 deletions(-)

diff -puN arch/i386/lib/semaphore.S~revert-x86_64-mm-i386-remove-lock-section arch/i386/lib/semaphore.S
--- a/arch/i386/lib/semaphore.S~revert-x86_64-mm-i386-remove-lock-section
+++ a/arch/i386/lib/semaphore.S
@@ -152,66 +152,3 @@ ENTRY(__read_lock_failed)
 	END(__read_lock_failed)
 
 #endif
-
-/* Fix up special calling conventions */
-ENTRY(call_rwsem_down_read_failed)
-	CFI_STARTPROC
-	push %ecx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET ecx,0
-	push %edx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET edx,0
-	call rwsem_down_read_failed
-	pop %edx
-	CFI_ADJUST_CFA_OFFSET -4
-	pop %ecx
-	CFI_ADJUST_CFA_OFFSET -4
-	ret
-	CFI_ENDPROC
-	END(call_rwsem_down_read_failed)
-
-ENTRY(call_rwsem_down_write_failed)
-	CFI_STARTPROC
-	push %ecx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET ecx,0
-	calll rwsem_down_write_failed
-	pop %ecx
-	CFI_ADJUST_CFA_OFFSET -4
-	ret
-	CFI_ENDPROC
-	END(call_rwsem_down_write_failed)
-
-ENTRY(call_rwsem_wake)
-	CFI_STARTPROC
-	decw %dx    /* do nothing if still outstanding active readers */
-	jnz 1f
-	push %ecx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET ecx,0
-	call rwsem_wake
-	pop %ecx
-	CFI_ADJUST_CFA_OFFSET -4
-1:	ret
-	CFI_ENDPROC
-	END(call_rwsem_wake)
-
-/* Fix up special calling conventions */
-ENTRY(call_rwsem_downgrade_wake)
-	CFI_STARTPROC
-	push %ecx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET ecx,0
-	push %edx
-	CFI_ADJUST_CFA_OFFSET 4
-	CFI_REL_OFFSET edx,0
-	call rwsem_downgrade_wake
-	pop %edx
-	CFI_ADJUST_CFA_OFFSET -4
-	pop %ecx
-	CFI_ADJUST_CFA_OFFSET -4
-	ret
-	CFI_ENDPROC
-	END(call_rwsem_downgrade_wake)
-
diff -puN include/asm-i386/mutex.h~revert-x86_64-mm-i386-remove-lock-section include/asm-i386/mutex.h
--- a/include/asm-i386/mutex.h~revert-x86_64-mm-i386-remove-lock-section
+++ a/include/asm-i386/mutex.h
@@ -30,10 +30,14 @@ do {									\
 									\
 	__asm__ __volatile__(						\
 		LOCK_PREFIX "   decl (%%eax)	\n"			\
-			"   jns 1f		\n"			\
-			"   call "#fail_fn"	\n"			\
+			"   js 2f		\n"			\
 			"1:			\n"			\
 									\
+		LOCK_SECTION_START("")					\
+			"2: call "#fail_fn"	\n"			\
+			"   jmp 1b		\n"			\
+		LOCK_SECTION_END					\
+									\
 		:"=a" (dummy)						\
 		: "a" (count)						\
 		: "memory", "ecx", "edx");				\
@@ -82,10 +86,14 @@ do {									\
 									\
 	__asm__ __volatile__(						\
 		LOCK_PREFIX "   incl (%%eax)	\n"			\
-			"   jg	1f		\n"			\
-			"   call "#fail_fn"	\n"			\
+			"   jle 2f		\n"			\
 			"1:			\n"			\
 									\
+		LOCK_SECTION_START("")					\
+			"2: call "#fail_fn"	\n"			\
+			"   jmp 1b		\n"			\
+		LOCK_SECTION_END					\
+									\
 		:"=a" (dummy)						\
 		: "a" (count)						\
 		: "memory", "ecx", "edx");				\
diff -puN include/asm-i386/rwsem.h~revert-x86_64-mm-i386-remove-lock-section include/asm-i386/rwsem.h
--- a/include/asm-i386/rwsem.h~revert-x86_64-mm-i386-remove-lock-section
+++ a/include/asm-i386/rwsem.h
@@ -99,9 +99,17 @@ static inline void __down_read(struct rw
 	__asm__ __volatile__(
 		"# beginning down_read\n\t"
 LOCK_PREFIX	"  incl      (%%eax)\n\t" /* adds 0x00000001, returns the old value */
-		"  jns        1f\n"
-		"  call call_rwsem_down_read_failed\n"
+		"  js        2f\n\t" /* jump if we weren't granted the lock */
 		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  pushl     %%ecx\n\t"
+		"  pushl     %%edx\n\t"
+		"  call      rwsem_down_read_failed\n\t"
+		"  popl      %%edx\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
 		"# ending down_read\n\t"
 		: "+m" (sem->count)
 		: "a" (sem)
@@ -143,9 +151,15 @@ static inline void __down_write_nested(s
 		"# beginning down_write\n\t"
 LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */
 		"  testl     %%edx,%%edx\n\t" /* was the count 0 before? */
-		"  jz        1f\n"
-		"  call call_rwsem_down_write_failed\n"
-		"1:\n"
+		"  jnz       2f\n\t" /* jump if we weren't granted the lock */
+		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  pushl     %%ecx\n\t"
+		"  call      rwsem_down_write_failed\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
 		"# ending down_write"
 		: "+m" (sem->count), "=d" (tmp)
 		: "a" (sem), "1" (tmp)
@@ -179,9 +193,17 @@ static inline void __up_read(struct rw_s
 	__asm__ __volatile__(
 		"# beginning __up_read\n\t"
 LOCK_PREFIX	"  xadd      %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */
-		"  jns        1f\n\t"
-		"  call call_rwsem_wake\n"
-		"1:\n"
+		"  js        2f\n\t" /* jump if the lock is being waited upon */
+		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  decw      %%dx\n\t" /* do nothing if still outstanding active readers */
+		"  jnz       1b\n\t"
+		"  pushl     %%ecx\n\t"
+		"  call      rwsem_wake\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
 		"# ending __up_read\n"
 		: "+m" (sem->count), "=d" (tmp)
 		: "a" (sem), "1" (tmp)
@@ -197,9 +219,17 @@ static inline void __up_write(struct rw_
 		"# beginning __up_write\n\t"
 		"  movl      %2,%%edx\n\t"
 LOCK_PREFIX	"  xaddl     %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */
-		"  jz       1f\n"
-		"  call call_rwsem_wake\n"
+		"  jnz       2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  decw      %%dx\n\t" /* did the active count reduce to 0? */
+		"  jnz       1b\n\t" /* jump back if not */
+		"  pushl     %%ecx\n\t"
+		"  call      rwsem_wake\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
 		"# ending __up_write\n"
 		: "+m" (sem->count)
 		: "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS)
@@ -214,9 +244,17 @@ static inline void __downgrade_write(str
 	__asm__ __volatile__(
 		"# beginning __downgrade_write\n\t"
 LOCK_PREFIX	"  addl      %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */
-		"  jns       1f\n\t"
-		"  call call_rwsem_downgrade_wake\n"
+		"  js        2f\n\t" /* jump if the lock is being waited upon */
 		"1:\n\t"
+		LOCK_SECTION_START("")
+		"2:\n\t"
+		"  pushl     %%ecx\n\t"
+		"  pushl     %%edx\n\t"
+		"  call      rwsem_downgrade_wake\n\t"
+		"  popl      %%edx\n\t"
+		"  popl      %%ecx\n\t"
+		"  jmp       1b\n"
+		LOCK_SECTION_END
 		"# ending __downgrade_write\n"
 		: "+m" (sem->count)
 		: "a" (sem), "i" (-RWSEM_WAITING_BIAS)
diff -puN include/asm-i386/semaphore.h~revert-x86_64-mm-i386-remove-lock-section include/asm-i386/semaphore.h
--- a/include/asm-i386/semaphore.h~revert-x86_64-mm-i386-remove-lock-section
+++ a/include/asm-i386/semaphore.h
@@ -100,10 +100,13 @@ static inline void down(struct semaphore
 	__asm__ __volatile__(
 		"# atomic down operation\n\t"
 		LOCK_PREFIX "decl %0\n\t"     /* --sem->count */
-		"jns 2f\n"
-		"\tlea %0,%%eax\n\t"
-		"call __down_failed\n"
-		"2:"
+		"js 2f\n"
+		"1:\n"
+		LOCK_SECTION_START("")
+		"2:\tlea %0,%%eax\n\t"
+		"call __down_failed\n\t"
+		"jmp 1b\n"
+		LOCK_SECTION_END
 		:"+m" (sem->count)
 		:
 		:"memory","ax");
@@ -120,12 +123,15 @@ static inline int down_interruptible(str
 	might_sleep();
 	__asm__ __volatile__(
 		"# atomic interruptible down operation\n\t"
-		"xorl %0,%0\n\t"
 		LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-		"jns 2f\n\t"
-		"lea %1,%%eax\n\t"
-		"call __down_failed_interruptible\n"
-		"2:"
+		"js 2f\n\t"
+		"xorl %0,%0\n"
+		"1:\n"
+		LOCK_SECTION_START("")
+		"2:\tlea %1,%%eax\n\t"
+		"call __down_failed_interruptible\n\t"
+		"jmp 1b\n"
+		LOCK_SECTION_END
 		:"=a" (result), "+m" (sem->count)
 		:
 		:"memory");
@@ -142,12 +148,15 @@ static inline int down_trylock(struct se
 
 	__asm__ __volatile__(
 		"# atomic interruptible down operation\n\t"
-		"xorl %0,%0\n\t"
 		LOCK_PREFIX "decl %1\n\t"     /* --sem->count */
-		"jns 2f\n\t"
-		"lea %1,%%eax\n\t"
+		"js 2f\n\t"
+		"xorl %0,%0\n"
+		"1:\n"
+		LOCK_SECTION_START("")
+		"2:\tlea %1,%%eax\n\t"
 		"call __down_failed_trylock\n\t"
-		"2:\n"
+		"jmp 1b\n"
+		LOCK_SECTION_END
 		:"=a" (result), "+m" (sem->count)
 		:
 		:"memory");
@@ -157,16 +166,22 @@ static inline int down_trylock(struct se
 /*
  * Note! This is subtle. We jump to wake people up only if
  * the semaphore was negative (== somebody was waiting on it).
+ * The default case (no contention) will result in NO
+ * jumps for both down() and up().
  */
 static inline void up(struct semaphore * sem)
 {
 	__asm__ __volatile__(
 		"# atomic up operation\n\t"
 		LOCK_PREFIX "incl %0\n\t"     /* ++sem->count */
-		"jg 1f\n\t"
-		"lea %0,%%eax\n\t"
-		"call __up_wakeup\n"
-		"1:"
+		"jle 2f\n"
+		"1:\n"
+		LOCK_SECTION_START("")
+		"2:\tlea %0,%%eax\n\t"
+		"call __up_wakeup\n\t"
+		"jmp 1b\n"
+		LOCK_SECTION_END
+		".subsection 0\n"
 		:"+m" (sem->count)
 		:
 		:"memory","ax");
_



^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 20:26       ` Andi Kleen
  2006-09-26 20:44         ` Linus Torvalds
@ 2006-09-27  6:04         ` Jan Engelhardt
  1 sibling, 0 replies; 17+ messages in thread
From: Jan Engelhardt @ 2006-09-27  6:04 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Linus Torvalds, linux-kernel, discuss

>
>Yes I managed to typo twice  (linus-2.6 instead of linux-2.6)
>Amazing, wasn't it?

Blame the Helsinki FTP - it made the grounds for typos of this kind ;-)



Jan Engelhardt
-- 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [discuss] Re: x86/x86-64 merge for 2.6.19
  2006-09-27  5:41 ` Andrew Morton
@ 2006-09-27  7:11   ` Andi Kleen
  0 siblings, 0 replies; 17+ messages in thread
From: Andi Kleen @ 2006-09-27  7:11 UTC (permalink / raw)
  To: discuss; +Cc: Andrew Morton, torvalds, linux-kernel, Jan Beulich

On Wednesday 27 September 2006 07:41, Andrew Morton wrote:
> On Tue, 26 Sep 2006 12:44:43 +0200
> Andi Kleen <ak@suse.de> wrote:
> 
> >       i386: Remove lock section support in semaphore.h
> 
> This change turns my x86_32 Vaio into a brick about half a second into
> bootup.  Screen goes black and the fan goes all whirry.

Oops. Sorry. I thought I had commented it out, but it sneaked back
in when I had to regenerated the tree.

> 
> It's a bit of a mystery why this well-reported bug was merged, but let us
> move on..

That was my fault clearly.
 
-Andi

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 21:43             ` Linus Torvalds
@ 2006-09-27  7:44               ` Rolf Eike Beer
  2006-09-27  8:05               ` Paolo Ciarrocchi
  1 sibling, 0 replies; 17+ messages in thread
From: Rolf Eike Beer @ 2006-09-27  7:44 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Paolo Ciarrocchi, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 664 bytes --]

Am Dienstag, 26. September 2006 23:43 schrieb Linus Torvalds:
> On Tue, 26 Sep 2006, Paolo Ciarrocchi wrote:
> > out of curiosity, wouldn't be better to sync with Andrew via git?
> > Why via plain patches?
> >
> > What am I missing?
>
> I think you're just missing that we've become so used to it that it's just
> easier than all the alternatives.

[...]

> I think it's worked out pretty well, no?

Nearly everyone else seems to remove the '[PATCH]' from the subject line when 
putting things into git. Everything I suspect coming from Andrew to your tree 
still has it. Is this intentional or just yet another skript needing a 
fix? :)

Eike

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: x86/x86-64 merge for 2.6.19
  2006-09-26 21:43             ` Linus Torvalds
  2006-09-27  7:44               ` Rolf Eike Beer
@ 2006-09-27  8:05               ` Paolo Ciarrocchi
  1 sibling, 0 replies; 17+ messages in thread
From: Paolo Ciarrocchi @ 2006-09-27  8:05 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel

On 9/26/06, Linus Torvalds <torvalds@osdl.org> wrote:
> On Tue, 26 Sep 2006, Paolo Ciarrocchi wrote:
> >
> > out of curiosity, wouldn't be better to sync with Andrew via git?
> > Why via plain patches?
> >
> > What am I missing?
>
> I think you're just missing that we've become so used to it that it's just
> easier than all the alternatives.

Umh.. good point ;)

> Also, the way we do things with Andrew actually has a few advantages over
> a straight git-to-git merge. In particular, when Andrew sends me his
> current stable quilt queue, every email is also Cc'd to the people who
> sent it to him originally or were otherwise involved.

I forgot that Andrew is CC'ing the "author" of the patch when he sends
to you the email.

> So the very act of transferring the patches from one tree to another
> sometimes produces an extra acknowledgement cycle, and we've had patches
> that got NACK'ed at that point because it was an older version of the
> patch etc.
>
> Now, I suspect this is more of an advantage with Andrew's tree than with
> most other trees (most other trees tend to have a much stricter focus),
> and perhaps equally importantly, it also wouldn't really work very well if
> _everybody_ did it, so I personally believe this is one of those
> situations where what's good for _one_ case may not actually be wonderful
> for _all_ cases.
>
> I think it's worked out pretty well, no?

Oh yes! I just did the mistake to think that the work flow of Andrew
was similar to the one used by Andy. And that's clearly a mistake.

Thanks for the clarification.

Ciao,
-- 
Paolo
http://paolo.ciarrocchi.googlepages.com
http://picasaweb.google.com/paolo.ciarrocchi

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2006-09-27  8:05 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-26 10:44 x86/x86-64 merge for 2.6.19 Andi Kleen
2006-09-26 19:48 ` Linus Torvalds
2006-09-26 20:02   ` Andi Kleen
2006-09-26 20:19     ` Linus Torvalds
2006-09-26 20:26       ` Andi Kleen
2006-09-26 20:44         ` Linus Torvalds
2006-09-26 21:23           ` [discuss] " Andi Kleen
2006-09-26 21:39             ` Linus Torvalds
2006-09-26 21:25           ` Paolo Ciarrocchi
2006-09-26 21:43             ` Linus Torvalds
2006-09-27  7:44               ` Rolf Eike Beer
2006-09-27  8:05               ` Paolo Ciarrocchi
2006-09-26 22:04           ` Sam Ravnborg
2006-09-26 22:20             ` Linus Torvalds
2006-09-27  6:04         ` Jan Engelhardt
2006-09-27  5:41 ` Andrew Morton
2006-09-27  7:11   ` [discuss] " Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox