2.6.12-rc5-mm1

2.6.12-rc5-mm1

[Andrew Morton]

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/

- Added Oracle's clustering filesystem driver, via git-ocfs.

    OCFS2, a shared disk cluster file system.  See
    Documentation/filesystems/ocfs2.txt Additionally a users guide is
    available at:
    http://oss.oracle.com/projects/ocfs2-tools/dist/documentation/users_guide.txt

- New Xtensa architecture: Tensilica Xtensa CPU series.

- Added the Red Hat distributed lock manager for people to look at.

- Various new git trees.  The remaining holdouts are:

	bk-acpi.patch
	bk-drm.patch
	bk-drm-via.patch
	bk-input.patch
	bk-nfs.patch
	bk-watchdog.patch

- The CPU scheduler is probably busted on the less-common architectures. 
  For now, those architectures will need to emulate
  sched-remove-set_tsk_need_resched-from-init_idle-v2-ia64-fix.patch

- Added the s390 team's execute-in-place driver.  Not sure that I like all
  the code duplication in this though.

- Again, if there are patches in here which you think should be merged in
  2.6.12, please point them out to me.

- CPU scheduler udpates, kexec/kdump updates, i2o updates, v4l updates, etc.



Changes since 2.6.12-rc4-mm2:


-fix-for-bttv-driver-v0915-for-leadtek-winfast-vc100-xp-capture-cards.patch
-serio-resume-fix.patch
-alps-printk-tidy.patch
-alps-resume-fix.patch
-serport-oops-fix.patch
-serio-id-attributes.patch
-fix-impossible-vmallocchunk.patch
-ide-proc-destroy-error.patch
-6300esb-tco-timer-support.patch
-uml-remove-elfh.patch
-uml-critical-change-memcpy-to-memmove.patch
-md-fix-splitting-of-md-linear-request-that-cross-a-device-boundary.patch
-md-set-the-unplug_fn-and-issue_flush_fn-for-md-devices-after-committed-to-creation.patch
-mm-fix-rss-counter-being-incremented-when-unmapping.patch
-mm-acct-accounting-fix.patch
-linux-kernel-elf-core-dump-privilege-elevation.patch
-x86_64-reduce-nmi-watchdog-stack-usage.patch
-x86_64-readd-missing-tests-in-entrys.patch
-x86_64-add-a-guard-page-at-the-end-of-the-47bit-address.patch
-x86_64-fix-defaults-for-physical-core-id-in.patch
-x86_64-increase-number-of-io-apics.patch
-x86_64-dont-look-up-struct-page-pointer-of-physical.patch
-x86_64-update-tsc-sync-algorithm.patch
-x86_64-remove-x86_apicid-field.patch
-x86_64-dont-print-the-internal-k8c-flag-in.patch
-x86_64-remove-unique-apic-io-apic-id-check.patch
-x86_64-add-pmtimer-support.patch
-x86_64-check-if-ptrace-rip-is-canonical.patch
-x86_64-fix-canonical-checking-for-segment-registers-in.patch
-x86_64-when-checking-vmalloc-mappings-dont-use.patch
-x86_64-fix-oem-hpet-check.patch
-x86_64-make-vsyscallc-compile-without-config_sysctl.patch
-x86_64-collected-nmi-watchdog-fixes.patch
-x86_64-collected-nmi-watchdog-fixes-warning-fix.patch
-x86_64-dont-assume-bsp-has-id-0-in-new-smp-bootup.patch
-x86_64-update-defconfig.patch
-mm-nommuc-try-to-fix-__vmalloc.patch
-drivers-input-keyboard-atkbdc-fix-off-by-one-errors.patch
-s390-dasd-set-online-failure.patch
-swapout-oops-fix.patch
-packet-driver-ioctl-fix.patch
-packet-driver-ioctl-fix-fix.patch
-crypto-fix-null-encryption-compression.patch
-cdrw-dvd-packet-writing-data-corruption-fix.patch
-spurious-interrupt-fix.patch
-libata-flush-comreset-set-and-clear.patch
-add-scsi-changer-driver.patch
-add-scsi-changer-driver-gregkh-driver-fix.patch
-block_read_full_page-get_block-error-fix.patch
-do_swap_page-can-map-random-data-if-swap-read-fails.patch
-wireless-3crwe154g72-kconfig-help-fix.patch
-smc91c92_cs-reduce-stack-usage-in-smc91c92_event.patch
-typo-in-tulip-driver.patch
-a-new-10gb-ethernet-driver-by-chelsio-communications.patch
-selinux-fix-avc_alloc_node-oom-with-no-policy-loaded.patch
-mips-add-resource-management-to-pmu.patch
-alpha-osf_sys-use-helper-functions-to-convert-between-tv-and-jiffies.patch
-sysfs-for-ipmi-for-new-mm-kernels.patch
-fix-pci-mmap-on-ppc-and-ppc64.patch
-pcmcia-ds-handle-any-error-code.patch
-kill-asm-ioctl32h.patch
-profilec-schedule-parsing-fix.patch
-ieee1394-feature-removal-notices.patch
-drivers-ieee1394-pcilynxc-remove-dead-options.patch
-drivers-ieee1394-ieee1394_transactionsc-possible-cleanups.patch
-ieee1394-remove-null-checks-prior-to-kfree-in-ieee1394-kfree-handles-null-pointers-fin.patch
-drivers-ieee1394-pcilynxc-use-the-dma_32bit_mask-constant.patch
-ieee1394-single-buffer-fixes-to-video1394.patch
-ieee1394-fix-cross_bound-check-for-null-iso-packets.patch
-ieee1394-fix-premature-expiry-of-async-packets.patch
-dvb-b2c2-flexcop-driver-refactoring-part-1-drop-old-b2c2-usb-stuff.patch
-dvb-b2c2-flexcop-driver-refactoring-part-2-add-modular-flexcop-driver.patch
-dvb-flexcop-fix-usb-transfer-handling.patch
-dvb-flexcop-add-acknowledgements.patch
-dvb-flexcop-fix-mac-address-reading.patch
-dvb-flexcop-fixed-interrupt-sharing.patch
-dvb-flexcop-use-hw-pid-filter.patch
-dvb-flexcop-fix-module-refcount-handling.patch
-dvb-flexcop-readme-update.patch
-dvb-flexcop-i2c-read-fixes.patch
-dvb-flexcop-diseqc-fix.patch
-dvb-support-for-tt-hauppauge-nexus-s-rev-23.patch
-dvb-saa7146-no-need-to-initialize-static-global-variables-to-0.patch
-dvb-dvb_frontend-fix-module-param.patch
-dvb-av7110-audio-out-fix.patch
-dvb-add-support-for-knc-1-cards.patch
-dvb-remove-unnecessary-casts-in-dvb-core.patch
-dvb-dvb_net-handle-ipv6-and-llc-snap.patch
-dvb-av7110-fix-video_set_display_format.patch
-dvb-av7110-fix-ntsc-pal-switching.patch
-dvb-av7110-fix-comment.patch
-dvb-av7110-fix-indentation.patch
-dvb-nxt6000-support-frontend-status-reads.patch
-dvb-tda1004x-formatting-cleanups.patch
-dvb-stv0299-fix-fe_dishnetwork_send_legacy_cmd.patch
-dvb-remove-unnecessary-casts-in-frontends.patch
-dvb-dib3000-add-null-pointer-check.patch
-dvb-ves1820-remove-unnecessary-msleep.patch
-dvb-mt352-embed-struct-mt352_config-in-mt352_state.patch
-dvb-tda1004x-dont-use-bitfields.patch
-dvb-tda1004x-allow-n_i2c-to-be-overridden-by-the-card-driver.patch
-dvb-tda10046-support-for-different-firmware-versions.patch
-dvb-dvb-pllh-prevent-multiple-inclusion.patch
-dvb-make-needlessly-global-code-static-or-drop-it.patch
-dvb-frontends-misc-minor-cleanups.patch
-dvb-modified-dvb_register_adapter-to-avoid-kmalloc-kfree.patch
-dvb-bt8xx-update-documentation.patch
-dvb-dst-reorganize-twinhan-dst-driver-to-support-ci.patch
-dvb-dst-add-support-for-twinhan-200103a.patch
-dvb-dst-fixed-tuning-problem.patch
-dvb-dst-fix-for-descrambling-failure.patch
-dvb-dst-misc-fixes.patch
-dvb-bt8xx-updated-documentation.patch
-dvb-dst-fix-a-bug-in-the-module-parameter.patch
-dvb-dst-fixed-ci-debug-output.patch
-dvb-bt8xx-whitespace-cleanup.patch
-dvb-budget-av-ci-fixes.patch
-fusion-kfree-cleanup.patch

 Merged

+linus.patch

 Linus latest

+v4l-bttv-i2c-oops-fix.patch
+ipmi-build-fix.patch
+x86_64-config_bug=n-fixes.patch
+ib-allow-null-sa_query-callbacks.patch
+ib-fix-potential-ib_umad-leak.patch
+ib-fix-endianness-of-path-record-mtu-field.patch
+make-sure-therm_adt746x-only-handles-known-hardware.patch
+therm_adt746x-show-correct-sensor-locations.patch

 Fixes for 2.6.12

+namei-fixes-01-19.patch
+namei-fixes-02-19.patch
+namei-fixes-03-19.patch
+namei-fixes-04-19.patch
+namei-fixes-05-19.patch
+namei-fixes-06-19.patch
+namei-fixes-07-19.patch
+namei-fixes-08-19.patch
+namei-fixes-09-19.patch
+namei-fixes-10-19.patch
+namei-fixes-11-19.patch
+namei-fixes-12-19.patch
+namei-fixes-13-19.patch
+namei-fixes-14-19.patch
+namei-fixes-15-19.patch
+namei-fixes-16-19.patch
+namei-fixes-17-19.patch
+namei-fixes-18-19.patch
+namei-fixes-19-19.patch

 VFS name handling fixes

+ipmi-and-acpi=offht-acpi-get-firmware-failurepatch.patch
+ipmi-and-acpi=offht-ipmi_si_intf-acpi-disabled.patch

 IPMI/ACPI fixes

-cpufreq-CPUFREQ-14-powernow-k8-dual-core-on2.6.12.patch
+cpufreq-CPUFREQ-14-powernow-k8-dualcore.patch
-cpufreq-CPUFREQ-20-powernow-k8-static-cpu_sharedcore_mask.patch
+cpufreq-CPUFREQ-21-ondemand-cleanups.patch
+cpufreq-CPUFREQ-22-ondemand-store-idle-ticks-for-all-cpus.patch
+cpufreq-CPUFREQ-23-ondemand-idle_tick-cleanup.patch
+cpufreq-CPUFREQ-24-ondemand-automatic-downscaling.patch
+cpufreq-CPUFREQ-25-ondemand-default-sampling-downfactor.patch
+cpufreq-CPUFREQ-26-longhaul-disable-mastering.patch
+cpufreq-CPUFREQ-27-longhaul-magic-port-frobbing.patch
+cpufreq-CPUFREQ-28-longhaul-transition-latency.patch
+cpufreq-CPUFREQ-29-longhaul-icky-evil-nasty-ide-dma-wait.patch
+cpufreq-CPUFREQ-30-speedstep-lib-typos.patch

 cpufreq updates

-bk-cryptodev.patch
+git-cryptodev.patch

 The cryptodev tree is now in git

-gregkh-driver-driver-pm-diag-update.patch
-gregkh-driver-driver-remove-detach_state.patch
-gregkh-driver-attr_void.patch
+gregkh-driver-driver-model-documentation-update.patch
+gregkh-driver-libfs-add-simple-attribute-files.patch
+gregkh-driver-driver-fix-error-handling-in-bus_add_device.patch
+gregkh-driver-driver-device_attr-01.patch
+gregkh-driver-driver-device_attr-02.patch
+gregkh-driver-driver-device_attr-03.patch
+gregkh-driver-driver-device_attr-04.patch
+gregkh-driver-driver-device_attr-05.patch
+gregkh-driver-driver-device_attr-06.patch
+gregkh-driver-driver-device_attr-07.patch
+gregkh-driver-driver-device_attr-08.patch
+gregkh-driver-driver-device_attr-09.patch
+gregkh-driver-driver-device_attr-10.patch
+gregkh-driver-driver-device_attr-11.patch
+gregkh-driver-driver-device_attr-12.patch
+gregkh-driver-driver-device_attr-i2c-sysfs.h.patch
+gregkh-driver-driver-device_attr-i2c-adm1026.patch

 driver core tree updates

+ipmi-class_simple-fixes.patch

 Fix ipmi driver for driver core updates

-gregkh-i2c-w1-ds18xx_sensors.patch
-gregkh-i2c-w1-new_rom_family.patch
+gregkh-i2c-i2c-adm9240-cleanup.patch
+gregkh-i2c-i2c-jiffies.h.patch
+gregkh-i2c-i2c-macro-abuse-cleanup.patch
+gregkh-i2c-i2c-via686a-code-cleanup.patch
+gregkh-i2c-i2c-adm1021-remove_die_code.patch
+gregkh-i2c-i2c-Kconfig-corrections.patch
+gregkh-i2c-i2c-macro-abuse-cleanup-via686a.patch
+gregkh-i2c-i2c-driver-device_attr-fixup.patch
+gregkh-i2c-i2c-spelling-fixes-more-01.patch
+gregkh-i2c-i2c-spelling-fixes-more-02.patch
+gregkh-i2c-i2c-spelling-fixes-more-03.patch
+gregkh-i2c-i2c-spelling-fixes-more-04.patch
+gregkh-i2c-i2c-mpc-race-fix.patch
+gregkh-i2c-i2c-mailing-list-move.patch
+gregkh-i2c-w1-ds18xx_sensors.patch
+gregkh-i2c-w1-new_rom_family.patch
+gregkh-i2c-w1-cleanups.patch
+gregkh-i2c-w1-new-family-structure.patch
+gregkh-i2c-w1-build-fixups.patch
+gregkh-i2c-w1-remove-dup-family-id.patch

 i2c updates

-git-libata.patch

 Empty.

-bk-mtd.patch
+git-mtd.patch

 The MTD tree is now in git

+git-netdev-chelsio.patch
+git-netdev-ieee80211.patch
+git-netdev-wifi.patch

 More of Jeff's net device trees

+git-ocfs.patch

 Oracle cluster filesystem

-gregkh-pci-pci-hotplug-shpc-power-fix.patch
-gregkh-pci-pci-pciehp-downstream-port-fix.patch
-gregkh-pci-pci-cpci-update.patch
-gregkh-pci-pci-remove-pci_visit_dev.patch
-gregkh-pci-pci-modalias-sysfs.patch
-gregkh-pci-pci-modalias-hotplug.patch
+gregkh-pci-pci-fix-pci-mmap-on-ppc-and-ppc64.patch
+gregkh-pci-pci-driver-device_attr-fixup.patch

 PCI tree updates

+git-scsi-misc-build-fix.patch
+git-scsi-misc-sbp2-warning-fix.patch

 Fixes for git-scsi-misc.patch

+gregkh-usb-speedtch-prep.patch

 Makes Greg's USB tree apply

-gregkh-usb-usb-usbnet-fixes.patch
-gregkh-usb-usb-ehci-suspend-stop-timer.patch
-gregkh-usb-usb-modalias-sysfs.patch
-gregkh-usb-usb-cypress_m8-add-lt-20-support.patch
+gregkh-usb-usb-ftdi_sio-new-id.patch
+gregkh-usb-usb-serial-generic-init-fix.patch
+gregkh-usb-usb-fix-gadget-build-error.patch
+gregkh-usb-usb-driver-device_attr-fixup.patch
+gregkh-usb-usb-storage-trumpion.patch
+gregkh-usb-usb-modalias-shrink.patch

 USB tree updates

+usb-option-card-driver.patch

 New USB driver

+zd1201-build-fix.patch

 Bring back this USB-vs-netdev fix

+ppc64-sparsemem-memory-model-fix-2.patch
+remove-direct-ref-to-contig_page_data-for-x86-64.patch
+add-x86-64-kconfig-options-for-sparsemem.patch
+reorganize-x86-64-numa-and-discontigmem-config-options.patch
+add-x86-64-specific-support-for-sparsemem.patch
+add-x86-64-specific-support-for-sparsemem-tidy.patch

 More sparsemem updates

+avoiding-mmap-fragmentation-fix.patch
+avoiding-mmap-fragmentation-revert-unneeded-64-bit-changes.patch
+avoiding-mmap-fragmentation-fix-2.patch
+mmap-topdown-fix-for-large-stack-limit-large-allocation.patch
+mm-remove-pg_highmem.patch
+mm-remove-pg_highmem-tidy.patch
+vm-try_to_free_pages-unused-argument.patch

 Various MM fixes

+ppp_mppe-add-ppp-mppe-encryption-module-kconfig-fix.patch

 Fix ppp_mppe-add-ppp-mppe-encryption-module.patch

+use-pci_set_dma_mask-instead-of-direct-assignment-of-dma-mask.patch
+cs89x0c-support-for-philips-pnx0105-network-adapter.patch
+cs89x0c-support-for-philips-pnx0105-network-adapter-tidy.patch

 Net driver fixes

+ppc32-fix-some-minor-issues-related-to-fsl-book-e-kgdb.patch
+ppc32-fix-alsa-powermac-driver-on-old-machines.patch
+ppc32-add-via-ide-support-to-mpc8555-cds-platform.patch
+ppc32-support-for-82xx-pqii-on-chip-pci-bridge.patch

 ppc32 updates

+ppc64-quieten-rtas-printks.patch

 ppc64 fix

-x86-port-lockless-mce-preparation.patch
-x86-port-lockless-mce-implementation.patch
-x86-port-lockless-mce-implementation-fix.patch
-x86-port-lockless-mce-implementation-fix-2.patch

 Dropped

+m32r-build-fix-for-asm-m32r-topologyh.patch

 m32r fix

+ppc64-pcibus_to_node-fix.patch
+fix-pcibus_to_node-for-x86_64.patch

 Fixes for pcibus_to_node patch in -mm

+i386-selectable-frequency-of-the-timer-interrupt.patch
+ia64-selectable-timer-interrupt-frequency.patch
+i386-collect-host-bridge-resources.patch
+x86-avoid-wasting-irqs-for-pci-devices.patch
+via-82c586b-irq-routing-fix.patch
+x86-include-asm-uaccessh-in-asm-checksumh.patch
+x86-remove-i386_ksymsc-almost.patch

 x86 updates

+x86_64-avoid-wasting-irqs.patch
+x86_64-collect-host-bridge-resources.patch

 x86_64 updates

+ioc4-core-driver-rewrite.patch
+ioc4-config-split.patch
+ioc4-pci-bus-speed-detection.patch

 IOC driver rewrite

-suspend-resume-smp-support-fix-3.patch

 Dropped

-iounmap-debugging.patch

 This broke - dropped

+turn-soft-lock-off-when-panicking.patch

 Quash the softlockup detector after a panic

-rt-lsm.patch

 Dropped

+cfq-cfq-elevator_insert_back-fix.patch
+cfq-cfq_io_context-leak-fix.patch
+cfq-remove-serveral-unused-fields-from-cfq-data-structures.patch

 CFQ fixes

+timers-introduce-try_to_del_timer_sync.patch
+posix-timers-use-try_to_del_timer_sync.patch

 posx timers cleanups

+kprobes-function-return-probes-fix-5.patch
+move-kprobe-arming-into-arch-specific-code.patch
+kprobes-moves-lock-unlock-to-non-arch-kprobe_flush_task.patch
+kprobes-ia64-kdebug-die-notification.patch
+kprobes-ia64-kdebug-die-notification-fix.patch
+kprobes-ia64-arch-specific-handling-of-kprobes.patch
+kprobes-ia64-arch-specific-handling-of-kprobes-fix.patch
+kprobes-ia64-architecture-specific-support.patch
+kprobes-ia64-support-kprobe-on-branch-call-instructions.patch
+kprobes-temporary-disarming-of-reentrant-probe.patch
+kprobes-temporary-disarming-of-reentrant-probe-for-i386.patch
+kprobes-temporary-disarming-of-reentrant-probe-for-x86_64.patch
+kprobes-temporary-disarming-of-reentrant-probe-for-ppc64.patch
+kprobes-temporary-disarming-of-reentrant-probe-for-sparc64.patch

 Much kprobes work

+remove-eventpoll-macro-obfuscation.patch

 epoll cleanup

+optimize-sys_times-for-a-single-thread-process.patch
+optimize-sys_times-for-a-single-thread-process-update.patch
+optimize-sys_times-for-a-single-thread-process-update-2.patch

 sys_times() hack^wspeedup

+turn-off-sibling-call-optimization-w-frame-pointers.patch

 Improve debuggability

+add-skip_hangcheck_timer.patch

 Add a way of whutting up the hangcheck timer

+ipcsem-remove-superflous-decrease-variable-from-sys_semtimedop.patch

 IPC cleanup

+reiserfs-add-checking-of-journal_begin-return-value.patch
+quota-improve-credits-estimates.patch
+quota-ext3-improve-quota-credit-estimates.patch
+quota-reiserfs-improve-quota-credit-estimates.patch

 quota fixes

+namespacec-fix-bind-mount-from-foreign-namespace.patch
+namespacec-fix-mnt_namespace-clearing.patch
+namespacec-fix-race-in-mark_mounts_for_expiry.patch
+namespacec-cleanup-in-mark_mounts_for_expiry.patch
+namespacec-split-mark_mounts_for_expiry.patch
+namespacec-fix-expiring-of-detached-mount.patch

 namespace.c fixes

+xtensa-tensilica-xtensa-cpu-arch-maintainer-record.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-1.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-2.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-3.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-4.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-5.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-6.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-7.patch
+xtensa-architecture-support-for-tensilica-xtensa-part-8.patch

 New architecture

+make-reiserfs-bug-on-too-big-transaction.patch

 reiserfs sanity check

+ipmi-doc-updates-for-ipmi.patch
+ipmi-ipmi-timer-shutdown-cleanup.patch
+ipmi-add-ipmi-power-cycle-capability.patch
+ipmi-use-completions-not-semaphores-in-the-ipmi-powerdown-code.patch
+ipmi-add-32-bit-ioctl-translations-for-64-bit-platforms.patch

 IPMI driver updates

+tpm-replace-odd-LPC-init-function.patch

 TPM driver update

+dlm-core-locking.patch
+dlm-lockspaces-callbacks-directory.patch
+dlm-communication.patch
+dlm-recovery.patch
+dlm-configuration.patch
+dlm-device-interface.patch
+dlm-device-interface-fix.patch
+dlm-debug-fs.patch
+dlm-build.patch

 RH distrubuted lock manager

+connector-netlink-id-fix.patch
+connector-remove-socket-number-parameter.patch
+fork-connector-send-status-to-userspace.patch

 Connector driver updates

+inotify-44-update-2.patch

 inotify fixes

+i2o-bugfixes-and-compability-enhancements.patch
+i2o-first-code-cleanup-of-spare-warnings-and-unused.patch
+i2o-new-sysfs-attributes-and-adaptec-specific-block.patch
+i2o-new-sysfs-attributes-and-adaptec-specific-block-fix.patch
+i2o-adaptec-specific-sg_io-access-firmware-access-through.patch
+i2o-second-code-cleanup-of-sparse-warnings-and-unneeded.patch
+i2o-lindent-run-and-replacement-of-printk-through-osm.patch
+i2o-limit-max-sector-workaround-for-promise-controllers.patch

 i2o driver updates

+drop-obsolete-dibusb-driver.patch
+add-generalized-dvb-usb-driver.patch
+dvb-usb-fix-init-error-checking.patch
+dvb_frontend-use-time_after.patch
+flexcop-add-bcm3510-atsc-frontend-support-for-air2pc-card.patch
+flexcop-add-bcm3510-atsc-frontend-support-for-air2pc-card-fix.patch

 DVB updates

+pcmcia-add-a-few-more-ids-for-pcnet_cs.patch

 More pcmcia device IDs

+pcmcia-move-pcmcia-ioctl-to-a-separate-file-fix.patch

 Fix pcmcia-move-pcmcia-ioctl-to-a-separate-file.patch

+pcmcia-properly-handle-all-errors-of-register_chrdev.patch

 pcmcia error handling fix

-numa-aware-slab-allocator-v3.patch
-numa-aware-slab-allocator-v2-tidy.patch
-numa-aware-slab-allocator-v3-cleanup.patch
-ppc64-numa-nodes-hack.patch

 Dropped

+perfctr-ppc64-wraparound-fixes.patch
+perfctr-x86-update-with-k8-multicore-fixes-take-2.patch

 perfctr fixes

+sched-micro-optimize-task-requeueing-in-schedule.patch
+dynamic-sched-domains-sched-changes.patch
+dynamic-sched-domains-sched-changes-fix.patch
+dynamic-sched-domains-cpuset-changes.patch
+dynamic-sched-domains-ia64-changes.patch
+sched-implement-nice-support-across-physical-cpus-on-smp.patch
+sched-change_prio_bias_only_if_queued.patch
+sched-account_rt_tasks_in_prio_bias.patch
+consolidate-preempt-options-into-kernel-kconfigpreempt.patch
+sched-remove-set_tsk_need_resched-from-init_idle-v2.patch
+sched-remove-set_tsk_need_resched-from-init_idle-v2-ia64-fix.patch
+sched-voluntary-kernel-preemption.patch

 CPU scheduler updates

+bttv-support-for-adlink-rtv24-capture-card.patch
+bttv-support-for-adlink-rtv24-capture-card-tidy.patch
+bttv-support-for-adlink-rtv24-capture-card-more-tidy.patch
+v4l-saa7134-ntsc-vbi-fix.patch
+v4l-pal-m-chroma-subcarrier-frequency-fix.patch

 v4l updates

+kexec-kexec-on-panic-fix-with-nmi-watchdog-enabled.patch
+kdump-documentation-update-to-add-gdb-macros.patch
+kdump-use-real-pt_regs-from-exception.patch
+kdump-use-real-pt_regs-from-exception-fix.patch
+kdump-use-real-pt_regs-from-exception-fix-fix.patch
+kdump-save-trap-information-for-later-analysis.patch

 keec/kdump updates and fixes

+reiser4-mm-remove-pg_highmem-fix.patch

 Fix reiser4 for the PG_highmem removal

+vga-to-fbcon-fix.patch

 vgacon fix

+docbook-update-comments.patch

 kerneldoc fixlets

+fuse-dont-allow-restarting-of-system-calls.patch

 FUSE update

+xip-bdev-execute-in-place-3rd-version.patch
+xip-fs-mm-execute-in-place-3rd-version.patch
+xip-fs-mm-execute-in-place-3rd-version-fix.patch
+xip-ext2-execute-in-place-3rd-version.patch
+xip-ext2-execute-in-place-3rd-version-fixes.patch
+xip-madvice-fadvice-execute-in-place-3rd-version.patch
+xip-description.patch

 Execute-in-place driver



number of patches in -mm: 1270
number of changesets in external trees: 155
number of patches in -mm only: 1264
total patches: 1419



All 1270 patches:

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/patch-list

Re: 2.6.12-rc5-mm1

[Alexandre Buisse]

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

Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/

Hi Andrew,

missing extern in drivers/dlm/lvb_table.h.
The definition was moved into drivers/dlm/lock.c.
The attached patch fixes this.


Signed-off-by: Alexandre Buisse <Alexandre.Buisse@ens-lyon.fr>

Regards,
Alexandre

[-- Attachment #2: fix-dlm-extern-lvb_table.patch --]
[-- Type: text/x-patch, Size: 2317 bytes --]

--- linux-2.6.12-rc5-mm1/drivers/dlm/lock.c.old	2005-05-25 23:30:10.000000000 +0200
+++ linux-2.6.12-rc5-mm1/drivers/dlm/lock.c	2005-05-25 23:30:21.000000000 +0200
@@ -104,6 +104,29 @@ const int __dlm_compat_matrix[8][8] = {
         {0, 0, 0, 0, 0, 0, 0, 0}        /* PD */
 };
 
+/*
+ * This defines the direction of transfer of LVB data.
+ * Granted mode is the row; requested mode is the column.
+ * Usage: matrix[grmode+1][rqmode+1]
+ * 1 = LVB is returned to the caller
+ * 0 = LVB is written to the resource
+ * -1 = nothing happens to the LVB
+ */
+
+
+const int dlm_lvb_operations[8][8] = {
+        /* UN   NL  CR  CW  PR  PW  EX  PD*/
+        {  -1,  1,  1,  1,  1,  1,  1, -1 }, /* UN */
+        {  -1,  1,  1,  1,  1,  1,  1,  0 }, /* NL */
+        {  -1, -1,  1,  1,  1,  1,  1,  0 }, /* CR */
+        {  -1, -1, -1,  1,  1,  1,  1,  0 }, /* CW */
+        {  -1, -1, -1, -1,  1,  1,  1,  0 }, /* PR */
+        {  -1,  0,  0,  0,  0,  0,  1,  0 }, /* PW */
+        {  -1,  0,  0,  0,  0,  0,  0,  0 }, /* EX */
+        {  -1,  0,  0,  0,  0,  0,  0,  0 }  /* PD */
+};
+
+
 #define modes_compat(gr, rq) \
 	__dlm_compat_matrix[(gr)->lkb_grmode + 1][(rq)->lkb_rqmode + 1]
 
--- linux-2.6.12-rc5-mm1/drivers/dlm/lvb_table.h.old	2005-05-25 23:30:34.000000000 +0200
+++ linux-2.6.12-rc5-mm1/drivers/dlm/lvb_table.h	2005-05-25 23:32:35.000000000 +0200
@@ -13,26 +13,7 @@
 #ifndef __LVB_TABLE_DOT_H__
 #define __LVB_TABLE_DOT_H__
 
-/*
- * This defines the direction of transfer of LVB data.
- * Granted mode is the row; requested mode is the column.
- * Usage: matrix[grmode+1][rqmode+1]
- * 1 = LVB is returned to the caller
- * 0 = LVB is written to the resource
- * -1 = nothing happens to the LVB
- */
-
-extern const int dlm_lvb_operations[8][8] = {
-        /* UN   NL  CR  CW  PR  PW  EX  PD*/
-        {  -1,  1,  1,  1,  1,  1,  1, -1 }, /* UN */
-        {  -1,  1,  1,  1,  1,  1,  1,  0 }, /* NL */
-        {  -1, -1,  1,  1,  1,  1,  1,  0 }, /* CR */
-        {  -1, -1, -1,  1,  1,  1,  1,  0 }, /* CW */
-        {  -1, -1, -1, -1,  1,  1,  1,  0 }, /* PR */
-        {  -1,  0,  0,  0,  0,  0,  1,  0 }, /* PW */
-        {  -1,  0,  0,  0,  0,  0,  0,  0 }, /* EX */
-        {  -1,  0,  0,  0,  0,  0,  0,  0 }  /* PD */
-};
+extern const int dlm_lvb_operations[8][8];
 
 #endif
 

Re: 2.6.12-rc5-mm1

[Brice Goglin]

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

Andrew Morton a écrit :
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/

Hi Andrew,

It looks like dlm assumes that CONFIG_DLM_DEBUG is set.
The attached patch fixes this.

Regards,
Brice

[-- Attachment #2: fix-dlm-without-debug.patch --]
[-- Type: text/x-patch, Size: 476 bytes --]

--- linux-mm/drivers/dlm/main.c.old	2005-05-25 23:44:27.000000000 +0200
+++ linux-mm/drivers/dlm/main.c	2005-05-25 23:46:41.000000000 +0200
@@ -19,8 +19,20 @@
 #include "memory.h"
 #include "lowcomms.h"
 
+#ifdef CONFIG_DLM_DEBUG
 int dlm_register_debugfs(void);
 void dlm_unregister_debugfs(void);
+#else
+int dlm_register_debugfs(void)
+{
+	return 0;
+}
+
+void dlm_unregister_debugfs(void)
+{
+}
+#endif
+
 int dlm_node_ioctl_init(void);
 void dlm_node_ioctl_exit(void);
 

Re: 2.6.12-rc5-mm1

[Brice Goglin]

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

Andrew Morton a écrit :
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/

Hi Andrew,

drivers/pcmcia/ds.c defines pcmcia_store_allow_func_id_match
without the new "struct device_attribute *attr" argument.
The attached patch fixes this.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>

Regards,
Brice

[-- Attachment #2: fix-pcmcia-ds-device-attribute.patch --]
[-- Type: text/x-patch, Size: 577 bytes --]

--- linux-mm/drivers/pcmcia/ds.c.old	2005-05-25 23:54:03.000000000 +0200
+++ linux-mm/drivers/pcmcia/ds.c	2005-05-25 23:54:25.000000000 +0200
@@ -848,7 +848,8 @@ pcmcia_device_stringattr(prod_id3, prod_
 pcmcia_device_stringattr(prod_id4, prod_id[3]);
 
 
-static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, const char * buf, size_t count)
+static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, struct device_attribute *attr,
+						 const char * buf, size_t count)
 {
 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         if (!count)

Re: 2.6.12-rc5-mm1

[Jesper Juhl]

On Wed, 25 May 2005, Andrew Morton wrote:

> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/
> 
[...]
> 
> - Again, if there are patches in here which you think should be merged in
>   2.6.12, please point them out to me.
> 

I'd say the following patches of mine might are candidates : 

atm-nicstar-remove-a-bunch-of-pointless-casts-of-null.patch
cosmetic-fixes-for-example-programs-in-documentation-cdrom-sbpcd.patch
dont-do-pointless-null-checks-and-casts-before-kfree.patch
get-rid-of-redundant-null-checks-before-kfree-in-arch-i386.patch
kfree-cleanups-for-drivers-firmware.patch
kfree-cleanups-in-ixjc.patch
remove-pointless-null-check-before-kfree-in-sony535c.patch
remove-redundant-null-check-before-before-kfree-in.patch
remove-redundant-null-checks-before-kfree-in-sound-and.patch
streamline-preempt_count-type-across-archs.patch
preempt_count-is-int-remove-cast-and-dont-assign-to.patch

They are all quite simple and have not been the cause of any trouble in 
-mm, so we might as well get them merged.


-- 
Jesper Juhl

Re: 2.6.12-rc5-mm1

[Matthew Dobson]

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

I get the following when trying to build rc5-mm1:

arch/i386/kernel/setup.c:99: error: parse error before "acpi_sci_flags"
arch/i386/kernel/setup.c:99: warning: type defaults to `int' in declaration
of `acpi_sci_flags'
arch/i386/kernel/setup.c:99: warning: data definition has no type or
storage class
arch/i386/kernel/setup.c: In function `parse_cmdline_early':
arch/i386/kernel/setup.c:836: error: request for member `trigger' in
something not a structure or union
arch/i386/kernel/setup.c:839: error: request for member `trigger' in
something not a structure or union
arch/i386/kernel/setup.c:842: error: request for member `polarity' in
something not a structure or union
arch/i386/kernel/setup.c:845: error: request for member `polarity' in
something not a structure or union
make[1]: *** [arch/i386/kernel/setup.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Looks like when #ifdef CONFIG_ACPI was added to include/linux/acpi.h it
broke things b/c acpi_sci_flags is needed for CONFIG_ACPI_BOOT, which
depends on X86_HT || ACPI.  Thus, you can have ACPI=n, and X86_HT=y &
ACPI_BOOT=y and it won't build.  This patch at least gets it to build for me...

-Matt

[-- Attachment #2: fix_acpi_breakage.patch --]
[-- Type: text/x-patch, Size: 679 bytes --]

diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.12-rc5-mm1/include/linux/acpi.h linux-2.6.12-rc5-mm1+fix_acpi_error/include/linux/acpi.h
--- linux-2.6.12-rc5-mm1/include/linux/acpi.h	2005-05-25 15:25:56.000000000 -0700
+++ linux-2.6.12-rc5-mm1+fix_acpi_error/include/linux/acpi.h	2005-05-25 17:59:30.439404520 -0700
@@ -25,7 +25,7 @@
 #ifndef _LINUX_ACPI_H
 #define _LINUX_ACPI_H
 
-#ifdef CONFIG_ACPI
+#if defined(CONFIG_ACPI) || defined(CONFIG_ACPI_BOOT)
 
 #ifndef _LINUX
 #define _LINUX
@@ -543,6 +543,6 @@ static inline int acpi_boot_table_init(v
 	return 0;
 }
 
-#endif	/* CONFIG_ACPI */
+#endif	/* CONFIG_ACPI || CONFIG_ACPI_BOOT */
 
 #endif	/* _LINUX_ACPI_H */

Re: 2.6.12-rc5-mm1

[Ed Tomlinson]

On Wednesday 25 May 2005 16:49, you wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/
> 
> - Added Oracle's clustering filesystem driver, via git-ocfs.
> 
>     OCFS2, a shared disk cluster file system.  See
>     Documentation/filesystems/ocfs2.txt Additionally a users guide is
>     available at:
>     http://oss.oracle.com/projects/ocfs2-tools/dist/documentation/users_guide.txt
> 
> - New Xtensa architecture: Tensilica Xtensa CPU series.
> 
> - Added the Red Hat distributed lock manager for people to look at.
> 
> - Various new git trees.  The remaining holdouts are:

Got the following when I tried to use sound.  Anyone else see problems in alsa land?

May 25 21:17:38 grover kernel: [  131.322558] PGD 2ab13067 PUD 2ab1b067 PMD 2a3f1067 PTE 0
May 25 21:17:38 grover kernel: [  131.351464] CPU 0
May 25 21:17:38 grover kernel: [  131.358041] Modules linked in: radeon nfsd exportfs lockd sunrpc sg parport_pc lp parport ipv6 sd_
mod evdev mousedev tsdev usbhid usb_storage snd_intel8x0 snd_ac97_codec snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd soundcore sn
d_page_alloc ehci_hcd ohci_hcd eth1394 sata_nv libata forcedeth
 ohci1394 powernow_k8 freq_table processor cpufreq_userspace w83627hf eeprom i2c_sensor i2c_isa i2c_nforce2 i2c_core sr_mod sbp2 scs
i_mod ieee1394 rtc unix
May 25 21:17:38 grover kernel: [  131.487598] Pid: 5481, comm: artsd Not tainted 2.6.12-rc5-mm1
May 25 21:17:38 grover kernel: [  131.506496] RIP: 0010:[__nosave_end+129759479/2131247104] <ffffffff8813b8f7>{:snd_pcm:snd_pcm_mmap
_data_close+7}
May 25 21:17:38 grover kernel: [  131.535142] RSP: 0018:ffff81002ab9dee0  EFLAGS: 00010286
May 25 21:17:38 grover kernel: [  131.553183] RAX: 00002aaaadb59000 RBX: ffff810029c64988 RCX: fffffffffffffff2
May 25 21:17:38 grover kernel: [  131.576657] RDX: ffff810029c64988 RSI: ffff81002d672ce0 RDI: ffff81002b339f50
May 25 21:17:38 grover kernel: [  131.600129] RBP: ffff81002b3051c0 R08: ffff810029c649a8 R09: ffff81002ab9dec8
May 25 21:17:38 grover kernel: [  131.623602] R10: 0000000000000002 R11: 0000000000000206 R12: ffff81002b339f50
May 25 21:17:38 grover kernel: [  131.647075] R13: ffff81002b339f50 R14: ffff81002e7f2a08 R15: 00002aaaadb67000
May 25 21:17:38 grover kernel: [  131.670548] FS:  00002aaaad6d8f50(0000) GS:ffffffff80550840(0000) knlGS:0000000000000000
May 25 21:17:38 grover kernel: [  131.697165] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
May 25 21:17:38 grover kernel: [  131.716064] CR2: 00002aaaadb59098 CR3: 000000002aafd000 CR4: 00000000000006e0
May 25 21:17:38 grover kernel: [  131.739537] Process artsd (pid: 5481, threadinfo ffff81002ab9c000, task ffff81002ada97f0)
May 25 21:17:38 grover kernel: [  131.766439] Stack: ffffffff8016942d 0000000000000000 0000000000000000 ffff81002e7f2a00
May 25 21:17:38 grover kernel: [  131.792174]        ffffffff8016a936 ffff81002d672df0 ffff81002d672e08 ffff81002d672df0
May 25 21:17:38 grover kernel: [  131.818481]        ffff81002e7f2a00 0000000000560600
May 25 21:17:38 grover kernel: [  131.835065] Call Trace:<ffffffff8016942d>{remove_vm_struct+125} <ffffffff8016a936>{do_munmap+550}
May 25 21:17:38 grover kernel: [  131.864282]        <ffffffff8016b0fd>{sys_munmap+77} <ffffffff8010ead6>{system_call+126}
May 25 21:17:38 grover kernel: [  131.890928]
May 25 21:17:38 grover kernel: [  131.898387]
May 25 21:17:38 grover kernel: [  131.898388] Code: 48 8b 80 98 00 00 00 ff 88 08 01 00 00 c3 66 66 66 90 66 66

Hope this helps,
Ed Tomlinson

Re: 2.6.12-rc5-mm1

[Andrew Morton]

(Added alsa-devel to cc)

Ed Tomlinson <tomlins@cam.org> wrote:
>
> On Wednesday 25 May 2005 16:49, you wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/
> > 
> > - Added Oracle's clustering filesystem driver, via git-ocfs.
> > 
> >     OCFS2, a shared disk cluster file system.  See
> >     Documentation/filesystems/ocfs2.txt Additionally a users guide is
> >     available at:
> >     http://oss.oracle.com/projects/ocfs2-tools/dist/documentation/users_guide.txt
> > 
> > - New Xtensa architecture: Tensilica Xtensa CPU series.
> > 
> > - Added the Red Hat distributed lock manager for people to look at.
> > 
> > - Various new git trees.  The remaining holdouts are:
> 
> Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> 
> May 25 21:17:38 grover kernel: [  131.322558] PGD 2ab13067 PUD 2ab1b067 PMD 2a3f1067 PTE 0
> May 25 21:17:38 grover kernel: [  131.351464] CPU 0
> May 25 21:17:38 grover kernel: [  131.358041] Modules linked in: radeon nfsd exportfs lockd sunrpc sg parport_pc lp parport ipv6 sd_
> mod evdev mousedev tsdev usbhid usb_storage snd_intel8x0 snd_ac97_codec snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd soundcore sn
> d_page_alloc ehci_hcd ohci_hcd eth1394 sata_nv libata forcedeth
>  ohci1394 powernow_k8 freq_table processor cpufreq_userspace w83627hf eeprom i2c_sensor i2c_isa i2c_nforce2 i2c_core sr_mod sbp2 scs
> i_mod ieee1394 rtc unix
> May 25 21:17:38 grover kernel: [  131.487598] Pid: 5481, comm: artsd Not tainted 2.6.12-rc5-mm1
> May 25 21:17:38 grover kernel: [  131.506496] RIP: 0010:[__nosave_end+129759479/2131247104] <ffffffff8813b8f7>{:snd_pcm:snd_pcm_mmap
> _data_close+7}
> May 25 21:17:38 grover kernel: [  131.535142] RSP: 0018:ffff81002ab9dee0  EFLAGS: 00010286
> May 25 21:17:38 grover kernel: [  131.553183] RAX: 00002aaaadb59000 RBX: ffff810029c64988 RCX: fffffffffffffff2
> May 25 21:17:38 grover kernel: [  131.576657] RDX: ffff810029c64988 RSI: ffff81002d672ce0 RDI: ffff81002b339f50
> May 25 21:17:38 grover kernel: [  131.600129] RBP: ffff81002b3051c0 R08: ffff810029c649a8 R09: ffff81002ab9dec8
> May 25 21:17:38 grover kernel: [  131.623602] R10: 0000000000000002 R11: 0000000000000206 R12: ffff81002b339f50
> May 25 21:17:38 grover kernel: [  131.647075] R13: ffff81002b339f50 R14: ffff81002e7f2a08 R15: 00002aaaadb67000
> May 25 21:17:38 grover kernel: [  131.670548] FS:  00002aaaad6d8f50(0000) GS:ffffffff80550840(0000) knlGS:0000000000000000
> May 25 21:17:38 grover kernel: [  131.697165] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> May 25 21:17:38 grover kernel: [  131.716064] CR2: 00002aaaadb59098 CR3: 000000002aafd000 CR4: 00000000000006e0
> May 25 21:17:38 grover kernel: [  131.739537] Process artsd (pid: 5481, threadinfo ffff81002ab9c000, task ffff81002ada97f0)
> May 25 21:17:38 grover kernel: [  131.766439] Stack: ffffffff8016942d 0000000000000000 0000000000000000 ffff81002e7f2a00
> May 25 21:17:38 grover kernel: [  131.792174]        ffffffff8016a936 ffff81002d672df0 ffff81002d672e08 ffff81002d672df0
> May 25 21:17:38 grover kernel: [  131.818481]        ffff81002e7f2a00 0000000000560600
> May 25 21:17:38 grover kernel: [  131.835065] Call Trace:<ffffffff8016942d>{remove_vm_struct+125} <ffffffff8016a936>{do_munmap+550}
> May 25 21:17:38 grover kernel: [  131.864282]        <ffffffff8016b0fd>{sys_munmap+77} <ffffffff8010ead6>{system_call+126}
> May 25 21:17:38 grover kernel: [  131.890928]
> May 25 21:17:38 grover kernel: [  131.898387]
> May 25 21:17:38 grover kernel: [  131.898388] Code: 48 8b 80 98 00 00 00 ff 88 08 01 00 00 c3 66 66 66 90 66 66
> 
> Hope this helps,
> Ed Tomlinson

Re: 2.6.12-rc5-mm1

[Yani Ioannou]

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

Hi Andrew,

This patch updates all the device attribute callbacks that weren't
updated with the new parameter, I guess because they weren't in Greg's
tree (including drivers/pcmcia/ds.c). Without the patch these
callbacks are probably broken (and generate a warning along the lines
of "assignment from incompatible pointer type").

Please see http://lkml.org/lkml/2005/5/19/40 for the scripts I used to
update the attributes automatically.

Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>

Thanks,
Yani
 
  char/tpm/tpm.c         |    2 +-
  char/tpm/tpm.h         |    8 ++++----
  message/i2o/bus-osm.c  |    2 +-
  message/i2o/exec-osm.c |    4 ++--
  pcmcia/ds.c            |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

[-- Attachment #2: patch-linux-2.6.12-rc5-mm1-devattrupdate.diff --]
[-- Type: text/x-patch, Size: 3984 bytes --]

diff -uprN -X dontdiff linux-2.6.12-rc5-mm1/drivers/char/tpm/tpm.c linux-2.6.12-rc5-mm1-update/drivers/char/tpm/tpm.c
--- linux-2.6.12-rc5-mm1/drivers/char/tpm/tpm.c	2005-05-26 01:13:02.000000000 -0400
+++ linux-2.6.12-rc5-mm1-update/drivers/char/tpm/tpm.c	2005-05-26 01:17:58.000000000 -0400
@@ -299,7 +299,7 @@ ssize_t show_caps(struct device *dev, st
 
 EXPORT_SYMBOL_GPL(tpm_show_caps);
 
-ssize_t tpm_store_cancel(struct device * dev, const char *buf,
+ssize_t tpm_store_cancel(struct device * dev, struct device_attribute *attr, const char *buf,
 			 size_t count)
 {
 	struct tpm_chip *chip = dev_get_drvdata(dev);
diff -uprN -X dontdiff linux-2.6.12-rc5-mm1/drivers/char/tpm/tpm.h linux-2.6.12-rc5-mm1-update/drivers/char/tpm/tpm.h
--- linux-2.6.12-rc5-mm1/drivers/char/tpm/tpm.h	2005-05-26 01:13:02.000000000 -0400
+++ linux-2.6.12-rc5-mm1-update/drivers/char/tpm/tpm.h	2005-05-26 01:17:58.000000000 -0400
@@ -35,10 +35,10 @@ enum tpm_addr {
 	TPM_DATA = 0x4F
 };
 
-extern ssize_t tpm_show_pubek(struct device *, char *);
-extern ssize_t tpm_show_pcrs(struct device *, char *);
-extern ssize_t tpm_show_caps(struct device *, char *);
-extern ssize_t tpm_store_cancel(struct device *, const char *, size_t);
+extern ssize_t tpm_show_pubek(struct device *, struct device_attribute *attr, char *);
+extern ssize_t tpm_show_pcrs(struct device *, struct device_attribute *attr, char *);
+extern ssize_t tpm_show_caps(struct device *, struct device_attribute *attr, char *);
+extern ssize_t tpm_store_cancel(struct device *, struct device_attribute *attr, const char *, size_t);
 
 
 struct tpm_chip;
diff -uprN -X dontdiff linux-2.6.12-rc5-mm1/drivers/message/i2o/bus-osm.c linux-2.6.12-rc5-mm1-update/drivers/message/i2o/bus-osm.c
--- linux-2.6.12-rc5-mm1/drivers/message/i2o/bus-osm.c	2005-05-26 01:13:13.000000000 -0400
+++ linux-2.6.12-rc5-mm1-update/drivers/message/i2o/bus-osm.c	2005-05-26 01:18:14.000000000 -0400
@@ -59,7 +59,7 @@ static int i2o_bus_scan(struct i2o_devic
  *
  *	Returns count.
  */
-static ssize_t i2o_bus_store_scan(struct device *d, const char *buf,
+static ssize_t i2o_bus_store_scan(struct device *d, struct device_attribute *attr, const char *buf,
 				  size_t count)
 {
 	struct i2o_device *i2o_dev = to_i2o_device(d);
diff -uprN -X dontdiff linux-2.6.12-rc5-mm1/drivers/message/i2o/exec-osm.c linux-2.6.12-rc5-mm1-update/drivers/message/i2o/exec-osm.c
--- linux-2.6.12-rc5-mm1/drivers/message/i2o/exec-osm.c	2005-05-26 01:13:13.000000000 -0400
+++ linux-2.6.12-rc5-mm1-update/drivers/message/i2o/exec-osm.c	2005-05-26 01:18:14.000000000 -0400
@@ -261,7 +261,7 @@ static int i2o_msg_post_wait_complete(st
  *
  *	Returns number of bytes printed into buffer.
  */
-static ssize_t i2o_exec_show_vendor_id(struct device *d, char *buf)
+static ssize_t i2o_exec_show_vendor_id(struct device *d, struct device_attribute *attr, char *buf)
 {
 	struct i2o_device *dev = to_i2o_device(d);
 	u16 id;
@@ -281,7 +281,7 @@ static ssize_t i2o_exec_show_vendor_id(s
  *
  *	Returns number of bytes printed into buffer.
  */
-static ssize_t i2o_exec_show_product_id(struct device *d, char *buf)
+static ssize_t i2o_exec_show_product_id(struct device *d, struct device_attribute *attr, char *buf)
 {
 	struct i2o_device *dev = to_i2o_device(d);
 	u16 id;
diff -uprN -X dontdiff linux-2.6.12-rc5-mm1/drivers/pcmcia/ds.c linux-2.6.12-rc5-mm1-update/drivers/pcmcia/ds.c
--- linux-2.6.12-rc5-mm1/drivers/pcmcia/ds.c	2005-05-26 01:13:13.000000000 -0400
+++ linux-2.6.12-rc5-mm1-update/drivers/pcmcia/ds.c	2005-05-26 01:18:15.000000000 -0400
@@ -848,7 +848,7 @@ pcmcia_device_stringattr(prod_id3, prod_
 pcmcia_device_stringattr(prod_id4, prod_id[3]);
 
 
-static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, const char * buf, size_t count)
+static ssize_t pcmcia_store_allow_func_id_match (struct device * dev, struct device_attribute *attr, const char * buf, size_t count)
 {
 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
         if (!count)

Re: 2.6.12-rc5-mm1

[Martin J. Bligh]

Build failure on numaq:
http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq

In file included from include/linux/sched.h:12,
                 from arch/i386/kernel/asm-offsets.c:7:
include/linux/jiffies.h:42:3: #error You lose.
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:213:31: division by zero in #if
include/linux/jiffies.h:257:30: division by zero in #if
In file included from include/linux/sched.h:12,
                 from arch/i386/kernel/asm-offsets.c:7:
include/linux/jiffies.h: In function `jiffies_to_msecs':
include/linux/jiffies.h:262: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:262: error: (Each undeclared identifier is reported only once
include/linux/jiffies.h:262: error: for each function it appears in.)
include/linux/jiffies.h:268:36: division by zero in #if
include/linux/jiffies.h: In function `jiffies_to_usecs':
include/linux/jiffies.h:273: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:281:30: division by zero in #if
include/linux/jiffies.h: In function `msecs_to_jiffies':
include/linux/jiffies.h:286: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:294:36: division by zero in #if
include/linux/jiffies.h: In function `usecs_to_jiffies':
include/linux/jiffies.h:299: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h: In function `timespec_to_jiffies':
include/linux/jiffies.h:318: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:324: error: `SHIFT_HZ' undeclared (first use in this function)
include/linux/jiffies.h: In function `jiffies_to_timespec':
include/linux/jiffies.h:337: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h: In function `timeval_to_jiffies':
include/linux/jiffies.h:359: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:363: error: `SHIFT_HZ' undeclared (first use in this function)
include/linux/jiffies.h: In function `jiffies_to_timeval':
include/linux/jiffies.h:375: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h:385:6: division by zero in #if
include/linux/jiffies.h: In function `jiffies_to_clock_t':
include/linux/jiffies.h:386: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h: In function `clock_t_to_jiffies':
include/linux/jiffies.h:397: error: `CONFIG_HZ' undeclared (first use in this function)
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h:416:6: division by zero in #if
include/linux/jiffies.h: In function `jiffies_64_to_clock_t':
include/linux/jiffies.h:417: error: `CONFIG_HZ' undeclared (first use in this function)
make[1]: *** [arch/i386/kernel/asm-offsets.s] Error 1
make: *** [arch/i386/kernel/asm-offsets.s] Error 2
05/25/05-20:57:45 Build the kernel. Failed rc = 2
05/25/05-20:57:45 build: kernel build Failed rc = 1

Re: 2.6.12-rc5-mm1

[Martin J. Bligh]

--"Martin J. Bligh" <mbligh@mbligh.org> wrote (on Wednesday, May 25, 2005 23:37:26 -0700):

> Build failure on numaq:
> http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq

I take that back ... it's actually every ia32 machine I have that 
fails to build ...

M.

> In file included from include/linux/sched.h:12,
>                  from arch/i386/kernel/asm-offsets.c:7:
> include/linux/jiffies.h:42:3: #error You lose.
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:213:31: division by zero in #if
> include/linux/jiffies.h:257:30: division by zero in #if
> In file included from include/linux/sched.h:12,
>                  from arch/i386/kernel/asm-offsets.c:7:
> include/linux/jiffies.h: In function `jiffies_to_msecs':
> include/linux/jiffies.h:262: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:262: error: (Each undeclared identifier is reported only once
> include/linux/jiffies.h:262: error: for each function it appears in.)
> include/linux/jiffies.h:268:36: division by zero in #if
> include/linux/jiffies.h: In function `jiffies_to_usecs':
> include/linux/jiffies.h:273: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:281:30: division by zero in #if
> include/linux/jiffies.h: In function `msecs_to_jiffies':
> include/linux/jiffies.h:286: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:294:36: division by zero in #if
> include/linux/jiffies.h: In function `usecs_to_jiffies':
> include/linux/jiffies.h:299: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h: In function `timespec_to_jiffies':
> include/linux/jiffies.h:318: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:324: error: `SHIFT_HZ' undeclared (first use in this function)
> include/linux/jiffies.h: In function `jiffies_to_timespec':
> include/linux/jiffies.h:337: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h: In function `timeval_to_jiffies':
> include/linux/jiffies.h:359: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:363: error: `SHIFT_HZ' undeclared (first use in this function)
> include/linux/jiffies.h: In function `jiffies_to_timeval':
> include/linux/jiffies.h:375: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h:385:6: division by zero in #if
> include/linux/jiffies.h: In function `jiffies_to_clock_t':
> include/linux/jiffies.h:386: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h: In function `clock_t_to_jiffies':
> include/linux/jiffies.h:397: error: `CONFIG_HZ' undeclared (first use in this function)
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h:416:6: division by zero in #if
> include/linux/jiffies.h: In function `jiffies_64_to_clock_t':
> include/linux/jiffies.h:417: error: `CONFIG_HZ' undeclared (first use in this function)
> make[1]: *** [arch/i386/kernel/asm-offsets.s] Error 1
> make: *** [arch/i386/kernel/asm-offsets.s] Error 2
> 05/25/05-20:57:45 Build the kernel. Failed rc = 2
> 05/25/05-20:57:45 build: kernel build Failed rc = 1

Re: 2.6.12-rc5-mm1

[Andrew Morton]

"Martin J. Bligh" <mbligh@mbligh.org> wrote:
>
> Build failure on numaq:
>  http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq
> 
>  In file included from include/linux/sched.h:12,
>                   from arch/i386/kernel/asm-offsets.c:7:
>  include/linux/jiffies.h:42:3: #error You lose.

You lost!  CONFIG_HZ didn't get set.

Something obviously went wrong in the magic in kernel/Kconfig.hz.  Wanna do
`grep HZ .config' and see if you can work out why it broke?

Roman, is there a better way of doing the below?


From: Christoph Lameter <christoph@lameter.com>

Make the timer frequency selectable. The timer interrupt may cause bus
and memory contention in large NUMA systems since the interrupt occurs
on each processor HZ times per second.

Signed-off-by: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/Kconfig          |    2 +
 arch/x86_64/Kconfig        |    2 +
 include/asm-i386/param.h   |    4 ++-
 include/asm-x86_64/param.h |    6 +++--
 kernel/Kconfig.hz          |   46 +++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 57 insertions(+), 3 deletions(-)

diff -puN arch/i386/Kconfig~i386-selectable-frequency-of-the-timer-interrupt arch/i386/Kconfig
--- 25/arch/i386/Kconfig~i386-selectable-frequency-of-the-timer-interrupt	2005-05-23 19:41:04.000000000 -0700
+++ 25-akpm/arch/i386/Kconfig	2005-05-23 19:41:04.000000000 -0700
@@ -1116,6 +1116,8 @@ config APM_REAL_MODE_POWER_OFF
 	  a work-around for a number of buggy BIOSes. Switch this option on if
 	  your computer crashes instead of powering off properly.
 
+source kernel/Kconfig.hz
+
 endmenu
 
 source "arch/i386/kernel/cpu/cpufreq/Kconfig"
diff -puN arch/x86_64/Kconfig~i386-selectable-frequency-of-the-timer-interrupt arch/x86_64/Kconfig
--- 25/arch/x86_64/Kconfig~i386-selectable-frequency-of-the-timer-interrupt	2005-05-23 19:41:04.000000000 -0700
+++ 25-akpm/arch/x86_64/Kconfig	2005-05-23 19:41:04.000000000 -0700
@@ -401,6 +401,8 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
+source kernel/Kconfig.hz
+
 endmenu
 
 #
diff -puN include/asm-i386/param.h~i386-selectable-frequency-of-the-timer-interrupt include/asm-i386/param.h
--- 25/include/asm-i386/param.h~i386-selectable-frequency-of-the-timer-interrupt	2005-05-23 19:41:04.000000000 -0700
+++ 25-akpm/include/asm-i386/param.h	2005-05-23 19:41:04.000000000 -0700
@@ -1,8 +1,10 @@
+#include <linux/config.h>
+
 #ifndef _ASMi386_PARAM_H
 #define _ASMi386_PARAM_H
 
 #ifdef __KERNEL__
-# define HZ		1000		/* Internal kernel timer frequency */
+# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
 # define USER_HZ	100		/* .. some user interfaces are in "ticks" */
 # define CLOCKS_PER_SEC		(USER_HZ)	/* like times() */
 #endif
diff -puN include/asm-x86_64/param.h~i386-selectable-frequency-of-the-timer-interrupt include/asm-x86_64/param.h
--- 25/include/asm-x86_64/param.h~i386-selectable-frequency-of-the-timer-interrupt	2005-05-23 19:41:04.000000000 -0700
+++ 25-akpm/include/asm-x86_64/param.h	2005-05-23 19:41:04.000000000 -0700
@@ -1,9 +1,11 @@
+#include <linux/config.h>
+
 #ifndef _ASMx86_64_PARAM_H
 #define _ASMx86_64_PARAM_H
 
 #ifdef __KERNEL__
-# define HZ            1000            /* Internal kernel timer frequency */
-# define USER_HZ       100          /* .. some user interfaces are in "ticks */
+# define HZ            CONFIG_HZ	/* Internal kernel timer frequency */
+# define USER_HZ       100		/* .. some user interfaces are in "ticks */
 #define CLOCKS_PER_SEC        (USER_HZ)       /* like times() */
 #endif
 
diff -puN /dev/null kernel/Kconfig.hz
--- /dev/null	2003-09-15 06:40:47.000000000 -0700
+++ 25-akpm/kernel/Kconfig.hz	2005-05-23 19:41:04.000000000 -0700
@@ -0,0 +1,46 @@
+#
+# Timer Interrupt Frequency Configuration
+#
+
+choice
+	prompt "Timer frequency"
+	default HZ_250
+	help
+	 Allows the configuration of the timer frequency. It is customary
+	 to have the timer interrupt run at 1000 HZ but 100 HZ may be more
+	 beneficial for servers and NUMA systems that do not need to have
+	 a fast response for user interaction and that may experience bus
+	 contention and cacheline bounces as a result of timer interrupts.
+	 Note that the timer interrupt occurs on each processor in an SMP
+	 environment leading to NR_CPUS * HZ number of timer interrupts
+	 per second.
+
+
+	config HZ_100
+		bool "100 HZ"
+	help
+	  100 HZ is a typical choice for servers, SMP and NUMA systems
+	  with lots of processors that may show reduced performance if
+	  too many timer interrupts are occurring.
+
+	config HZ_250
+		bool "250 HZ"
+	help
+	 250 HZ is a good compromise choice allowing server performance
+	 while also showing good interactive responsiveness even
+	 on SMP and NUMA systems.
+
+	config HZ_1000
+		bool "1000 HZ"
+	help
+	 1000 HZ is the preferred choice for desktop systems and other
+	 systems requiring fast interactive responses to events.
+
+endchoice
+
+config HZ
+	int
+	default 100 if HZ_100
+	default 250 if HZ_250
+	default 1000 if HZ_1000
+
_

Re: 2.6.12-rc5-mm1

[Martin J. Bligh]

--Andrew Morton <akpm@osdl.org> wrote (on Wednesday, May 25, 2005 23:47:17 -0700):

> "Martin J. Bligh" <mbligh@mbligh.org> wrote:
>> 
>> Build failure on numaq:
>>  http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq
>> 
>>  In file included from include/linux/sched.h:12,
>>                   from arch/i386/kernel/asm-offsets.c:7:
>>  include/linux/jiffies.h:42:3: #error You lose.
> 
> You lost!  CONFIG_HZ didn't get set.
> 
> Something obviously went wrong in the magic in kernel/Kconfig.hz.  Wanna do
> `grep HZ .config' and see if you can work out why it broke?

Tis conspicious by it's absence.

mbligh@kernel:~/linux-2.6.12-rc5-mm1$ grep HZ .config
mbligh@kernel:~/linux-2.6.12-rc5-mm1$ 

I'll poke at it in the morning, with the benfits of less wine, and more 
sleep

M.

Re: 2.6.12-rc5-mm1

[Martin J. Bligh]

--"Martin J. Bligh" <mbligh@mbligh.org> wrote (on Thursday, May 26, 2005 00:05:33 -0700):

> 
> 
> --Andrew Morton <akpm@osdl.org> wrote (on Wednesday, May 25, 2005 23:47:17 -0700):
> 
>> "Martin J. Bligh" <mbligh@mbligh.org> wrote:
>>> 
>>> Build failure on numaq:
>>>  http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq
>>> 
>>>  In file included from include/linux/sched.h:12,
>>>                   from arch/i386/kernel/asm-offsets.c:7:
>>>  include/linux/jiffies.h:42:3: #error You lose.
>> 
>> You lost!  CONFIG_HZ didn't get set.
>> 
>> Something obviously went wrong in the magic in kernel/Kconfig.hz.  Wanna do
>> `grep HZ .config' and see if you can work out why it broke?
> 
> Tis conspicious by it's absence.
> 
> mbligh@kernel:~/linux-2.6.12-rc5-mm1$ grep HZ .config
> mbligh@kernel:~/linux-2.6.12-rc5-mm1$ 
> 
> I'll poke at it in the morning, with the benfits of less wine, and more 
> sleep
> 
> M.

source kernel/Kconfig.hz is under:
menu "APM (Advanced Power Management) BIOS Support"
depends on PM && !X86_VISWS

So it's screwed if you don't have PM defined, it seems.

Re: 2.6.12-rc5-mm1

[Martin J. Bligh]

--"Martin J. Bligh" <mbligh@mbligh.org> wrote (on Thursday, May 26, 2005 00:14:34 -0700):

> 
> 
> --"Martin J. Bligh" <mbligh@mbligh.org> wrote (on Thursday, May 26, 2005 00:05:33 -0700):
> 
>> 
>> 
>> --Andrew Morton <akpm@osdl.org> wrote (on Wednesday, May 25, 2005 23:47:17 -0700):
>> 
>>> "Martin J. Bligh" <mbligh@mbligh.org> wrote:
>>>> 
>>>> Build failure on numaq:
>>>>  http://ftp.kernel.org/pub/linux/kernel/people/mbligh/config/abat/numaq
>>>> 
>>>>  In file included from include/linux/sched.h:12,
>>>>                   from arch/i386/kernel/asm-offsets.c:7:
>>>>  include/linux/jiffies.h:42:3: #error You lose.
>>> 
>>> You lost!  CONFIG_HZ didn't get set.
>>> 
>>> Something obviously went wrong in the magic in kernel/Kconfig.hz.  Wanna do
>>> `grep HZ .config' and see if you can work out why it broke?
>> 
>> Tis conspicious by it's absence.
>> 
>> mbligh@kernel:~/linux-2.6.12-rc5-mm1$ grep HZ .config
>> mbligh@kernel:~/linux-2.6.12-rc5-mm1$ 
>> 
>> I'll poke at it in the morning, with the benfits of less wine, and more 
>> sleep
>> 
>> M.
> 
> source kernel/Kconfig.hz is under:
> menu "APM (Advanced Power Management) BIOS Support"
> depends on PM && !X86_VISWS
> 
> So it's screwed if you don't have PM defined, it seems.

Ironically once I work around that it fails with:

arch/i386/kernel/built-in.o(.init.text+0xfe4): In function `sys_set_thread_area':
arch/i386/kernel/process.c:869: undefined reference to `acpi_read_root_resources'
drivers/built-in.o(.text+0x1fa3d): In function `acpi_pci_root_add':
drivers/acpi/pci_root.c:275: undefined reference to `pci_acpi_scan_root'
make: *** [.tmp_vmlinux1] Error 1

instead. Oh well. bedtime.

M.

Re: 2.6.12-rc5-mm1

[Andrew Morton]

"Martin J. Bligh" <mbligh@mbligh.org> wrote:
>
> source kernel/Kconfig.hz is under:
>  menu "APM (Advanced Power Management) BIOS Support"
>  depends on PM && !X86_VISWS
> 
>  So it's screwed if you don't have PM defined, it seems.

Ah, OK.  Something like this:

--- 25/arch/i386/Kconfig~i386-selectable-frequency-of-the-timer-interrupt-fix	2005-05-26 00:22:55.000000000 -0700
+++ 25-akpm/arch/i386/Kconfig	2005-05-26 00:22:55.000000000 -0700
@@ -1116,8 +1116,6 @@ config APM_REAL_MODE_POWER_OFF
 	  a work-around for a number of buggy BIOSes. Switch this option on if
 	  your computer crashes instead of powering off properly.
 
-source kernel/Kconfig.hz
-
 endmenu
 
 source "arch/i386/kernel/cpu/cpufreq/Kconfig"
@@ -1275,6 +1273,8 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
+source kernel/Kconfig.hz
+
 #
 # Use the generic interrupt handling code in kernel/irq/:
 #
diff -puN arch/x86_64/Kconfig~i386-selectable-frequency-of-the-timer-interrupt-fix arch/x86_64/Kconfig
--- 25/arch/x86_64/Kconfig~i386-selectable-frequency-of-the-timer-interrupt-fix	2005-05-26 00:22:55.000000000 -0700
+++ 25-akpm/arch/x86_64/Kconfig	2005-05-26 00:22:55.000000000 -0700
@@ -401,8 +401,6 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
-source kernel/Kconfig.hz
-
 endmenu
 
 #
@@ -517,3 +515,5 @@ source "security/Kconfig"
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
+
+source kernel/Kconfig.hz
_



and this:


--- 25/arch/ia64/Kconfig~ia64-selectable-timer-interrupt-frequency-fix	2005-05-26 00:23:18.000000000 -0700
+++ 25-akpm/arch/ia64/Kconfig	2005-05-26 00:23:39.000000000 -0700
@@ -157,8 +157,6 @@ config IA64_PAGE_SIZE_64KB
 
 endchoice
 
-source kernel/Kconfig.hz
-
 config IA64_BRL_EMU
 	bool
 	depends on ITANIUM
@@ -445,3 +443,5 @@ source "arch/ia64/Kconfig.debug"
 source "security/Kconfig"
 
 source "crypto/Kconfig"
+
+source kernel/Kconfig.hz
_

Re: 2.6.12-rc5-mm1

[J.A. Magallon]

On 05.26, Andrew Morton wrote:
> 
> (Added alsa-devel to cc)
> 
> Ed Tomlinson <tomlins@cam.org> wrote:
> > 
> > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> > 

Me too. As beep-media-player ends playing a mp3 track, oops !
Decoded below, for if it gives additional info:

ksymoops 2.4.9 on i686 2.6.11-jam20.  Options used
     -V (default)
     -k /proc/ksyms (default)
     -l /proc/modules (default)
     -o /lib/modules/2.6.11-jam20/ (default)
     -m /boot/System.map-2.6.11-jam20 (default)

Warning: You did not tell me where to find symbol information.  I will
assume that the log matches the kernel and modules that are running
right now and I'll use the default options above for symbol resolution.
If the current kernel and/or modules do not match the log, you can get
more accurate output by telling me the kernel version and where to find
map, modules, ksyms etc.  ksymoops -h explains the options.

Error (regular_file): read_ksyms stat /proc/ksyms failed
No modules in ksyms, skipping objects
No ksyms, skipping lsmod
May 26 09:35:15 werewolf kernel:  <1>Unable to handle kernel paging request at virtual address a5a5c060
May 26 09:35:15 werewolf kernel: f0a08f70
May 26 09:35:15 werewolf kernel: *pde = 0295d067
May 26 09:35:15 werewolf kernel: Oops: 0000 [#2]
May 26 09:35:15 werewolf kernel: CPU:    0
May 26 09:35:15 werewolf kernel: EIP:    0060:[pg0+1079750512/1337656320]    Tainted: P      VLI
May 26 09:35:15 werewolf kernel: EIP:    0060:[<f0a08f70>]    Tainted: P      VLI
Using defaults from ksymoops -t elf32-i386 -a i386
May 26 09:35:15 werewolf kernel: EFLAGS: 00210282   (2.6.11-jam20) 
May 26 09:35:15 werewolf kernel: eax: a5a5c000   ebx: eebba67c   ecx: b2101f08   edx: f0a08f6d
May 26 09:35:15 werewolf kernel: esi: eebba6a4   edi: b26b7c78   ebp: c6da6680   esp: b2d50f6c
May 26 09:35:15 werewolf kernel: ds: 007b   es: 007b   ss: 0068
May 26 09:35:15 werewolf kernel: Stack: b0147ce3 00000000 eec3d580 b26b7c78 a5a5c000 b0149469 a5a4c000 eec3d580 
May 26 09:35:15 werewolf kernel:        b01497ce a5a4c000 a5a5c000 be93d120 eec3d580 eec3d5b0 00000002 b2d50000 
May 26 09:35:15 werewolf kernel:        b014983a a5a4c000 000000b8 b0102b0b a5a4c000 00010000 a6d131b4 000000b8 
May 26 09:35:15 werewolf kernel: Call Trace:
May 26 09:35:15 werewolf kernel:  [<b0147ce3>] remove_vm_struct+0x46/0x68
May 26 09:35:15 werewolf kernel:  [<b0149469>] unmap_vma_list+0xe/0x17
May 26 09:35:15 werewolf kernel:  [<b01497ce>] do_munmap+0xcb/0xff
May 26 09:35:15 werewolf kernel:  [<b014983a>] sys_munmap+0x38/0x50
May 26 09:35:15 werewolf kernel:  [<b0102b0b>] sysenter_past_esp+0x54/0x75
May 26 09:35:15 werewolf kernel: Code: e1 05 03 0d b0 c4 43 b0 eb c9 c7 42 44 9c 4d a1 f0 89 42 50 81 4a 14 00 00 08 00 8b 40 60 f0 ff 80 a4 00 00 00 31 c0 c3 8b 40 50 <8b> 40 60 f0 ff 88 a4 00 00 00 c3 8b 40 50 8b 40 60 f0 ff 80 a4 


>>EIP; f0a08f70 <pg0+405baf70/4fbb0400>   <=====

>>eax; a5a5c000 <phys_startup_32+a595c000/b0000000>
>>ebx; eebba67c <pg0+3e76c67c/4fbb0400>
>>ecx; b2101f08 <pg0+1cb3f08/4fbb0400>
>>edx; f0a08f6d <pg0+405baf6d/4fbb0400>
>>esi; eebba6a4 <pg0+3e76c6a4/4fbb0400>
>>edi; b26b7c78 <pg0+2269c78/4fbb0400>
>>ebp; c6da6680 <pg0+16958680/4fbb0400>
>>esp; b2d50f6c <pg0+2902f6c/4fbb0400>

Trace; b0147ce3 <remove_vm_struct+46/68>
Trace; b0149469 <unmap_vma_list+e/17>
Trace; b01497ce <do_munmap+cb/ff>
Trace; b014983a <sys_munmap+38/50>
Trace; b0102b0b <sysenter_past_esp+54/75>

This architecture has variable length instructions, decoding before eip
is unreliable, take these instructions with a pinch of salt.

Code;  f0a08f45 <pg0+405baf45/4fbb0400>
00000000 <_EIP>:
Code;  f0a08f45 <pg0+405baf45/4fbb0400>
   0:   e1 05                     loope  7 <_EIP+0x7>
Code;  f0a08f47 <pg0+405baf47/4fbb0400>
   2:   03 0d b0 c4 43 b0         add    0xb043c4b0,%ecx
Code;  f0a08f4d <pg0+405baf4d/4fbb0400>
   8:   eb c9                     jmp    ffffffd3 <_EIP+0xffffffd3>
Code;  f0a08f4f <pg0+405baf4f/4fbb0400>
   a:   c7 42 44 9c 4d a1 f0      movl   $0xf0a14d9c,0x44(%edx)
Code;  f0a08f56 <pg0+405baf56/4fbb0400>
  11:   89 42 50                  mov    %eax,0x50(%edx)
Code;  f0a08f59 <pg0+405baf59/4fbb0400>
  14:   81 4a 14 00 00 08 00      orl    $0x80000,0x14(%edx)
Code;  f0a08f60 <pg0+405baf60/4fbb0400>
  1b:   8b 40 60                  mov    0x60(%eax),%eax
Code;  f0a08f63 <pg0+405baf63/4fbb0400>
  1e:   f0 ff 80 a4 00 00 00      lock incl 0xa4(%eax)
Code;  f0a08f6a <pg0+405baf6a/4fbb0400>
  25:   31 c0                     xor    %eax,%eax
Code;  f0a08f6c <pg0+405baf6c/4fbb0400>
  27:   c3                        ret    
Code;  f0a08f6d <pg0+405baf6d/4fbb0400>
  28:   8b 40 50                  mov    0x50(%eax),%eax

This decode from eip onwards should be reliable

Code;  f0a08f70 <pg0+405baf70/4fbb0400>
00000000 <_EIP>:
Code;  f0a08f70 <pg0+405baf70/4fbb0400>   <=====
   0:   8b 40 60                  mov    0x60(%eax),%eax   <=====
Code;  f0a08f73 <pg0+405baf73/4fbb0400>
   3:   f0 ff 88 a4 00 00 00      lock decl 0xa4(%eax)
Code;  f0a08f7a <pg0+405baf7a/4fbb0400>
   a:   c3                        ret    
Code;  f0a08f7b <pg0+405baf7b/4fbb0400>
   b:   8b 40 50                  mov    0x50(%eax),%eax
Code;  f0a08f7e <pg0+405baf7e/4fbb0400>
   e:   8b 40 60                  mov    0x60(%eax),%eax
Code;  f0a08f81 <pg0+405baf81/4fbb0400>
  11:   f0                        lock
Code;  f0a08f82 <pg0+405baf82/4fbb0400>
  12:   ff                        .byte 0xff
Code;  f0a08f83 <pg0+405baf83/4fbb0400>
  13:   80                        .byte 0x80
Code;  f0a08f84 <pg0+405baf84/4fbb0400>
  14:   a4                        movsb  %ds:(%esi),%es:(%edi)


1 warning and 1 error issued.  Results may not be reliable.

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc5-mm1

[J.A. Magallon]

On 05.25, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.6.12-rc5-mm1/
> 
> 
> - Again, if there are patches in here which you think should be merged in
>   2.6.12, please point them out to me.
> 

I collected this from lkml:

--- linux-2.6.12-rc4-mm2/arch/i386/kernel/cpu/intel_cacheinfo.c.old	2005-05-17 00:05:28.000000000 +0200
+++ linux-2.6.12-rc4-mm2/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-05-17 00:05:49.000000000 +0200
@@ -118,7 +118,7 @@
 };
 
 #define MAX_CACHE_LEAVES		4
-static unsigned short __devinitdata	num_cache_leaves;
+static unsigned short			num_cache_leaves;
 
 static int __devinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
 {

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc5-mm1

[Andrew Morton]

"J.A. Magallon" <jamagallon@able.es> wrote:
>
>  I collected this from lkml:
> 
>  --- linux-2.6.12-rc4-mm2/arch/i386/kernel/cpu/intel_cacheinfo.c.old	2005-05-17 00:05:28.000000000 +0200
>  +++ linux-2.6.12-rc4-mm2/arch/i386/kernel/cpu/intel_cacheinfo.c	2005-05-17 00:05:49.000000000 +0200
>  @@ -118,7 +118,7 @@
>   };
>   
>   #define MAX_CACHE_LEAVES		4
>  -static unsigned short __devinitdata	num_cache_leaves;
>  +static unsigned short			num_cache_leaves;

Got it, thanks.

Re: 2.6.12-rc5-mm1

[Andrew Morton]

"J.A. Magallon" <jamagallon@able.es> wrote:
>
> 
> On 05.26, Andrew Morton wrote:
> > 
> > (Added alsa-devel to cc)
> > 
> > Ed Tomlinson <tomlins@cam.org> wrote:
> > > 
> > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> > > 
> 
> Me too. As beep-media-player ends playing a mp3 track, oops !

hm, OK, you're also on x86_64.  What sound card and driver?

> Decoded below, for if it gives additional info:

Actually, no, ksymoops removes info.  Please just send the kernel's oops
output directly.  (Make sure that CONFIG_KALLSYMS=y).

Re: 2.6.12-rc5-mm1

[Mikael Pettersson]

2.6.12-rc5-mm1 includes Andrea's seccomp-disable-tsc patch,
which I believe is broken on SMP. In process.c we find:

 /*
+ * This function selects if the context switch from prev to next
+ * has to tweak the TSC disable bit in the cr4.
+ */
+static void disable_tsc(struct thread_info *prev,
+			struct thread_info *next)
+{
+	if (unlikely(has_secure_computing(prev) ||
+		     has_secure_computing(next))) {
+		/* slow path here */
+		if (has_secure_computing(prev) &&
+		    !has_secure_computing(next)) {
+			clear_in_cr4(X86_CR4_TSD);
+		} else if (!has_secure_computing(prev) &&
+			   has_secure_computing(next))
+			set_in_cr4(X86_CR4_TSD);
+	}
+}

which it calls from __switch_to().

The problem is that {set,clear}_in_cr4() both update a single
global mmu_cr4_features variable, which is asynchronously written
to all CPUs by {,__}flush_tlb_all(). Hence, the CR4.TSD setting
is at best probabilistic.

I spotted this because perfctr used to flip CR4.PCE in __switch_to()
ages ago, but I had to abandon that when kernel 2.3.40 changed to
the current scheme with a global mmu_cr4_features.
(Another reason was that CR4 writes were and still are very slow.)

/Mikael

Re: 2.6.12-rc5-mm1

[Roman Zippel]

Hi,

On Thu, 26 May 2005, Andrew Morton wrote:

> "Martin J. Bligh" <mbligh@mbligh.org> wrote:
> >
> > source kernel/Kconfig.hz is under:
> >  menu "APM (Advanced Power Management) BIOS Support"
> >  depends on PM && !X86_VISWS
> > 
> >  So it's screwed if you don't have PM defined, it seems.
> 
> Ah, OK.  Something like this:

Only i386 has this problem, the others put it into the "Processor type and 
features" menu, where it doesn't get the extra dependencies, so the 
easiest solution might to move it for i386 there as well.

bye, Roman

Re: 2.6.12-rc5-mm1

[Andrea Arcangeli]

On Thu, May 26, 2005 at 10:57:27AM +0200, Mikael Pettersson wrote:
> 2.6.12-rc5-mm1 includes Andrea's seccomp-disable-tsc patch,
> which I believe is broken on SMP. In process.c we find:
> 
>  /*
> + * This function selects if the context switch from prev to next
> + * has to tweak the TSC disable bit in the cr4.
> + */
> +static void disable_tsc(struct thread_info *prev,
> +			struct thread_info *next)
> +{
> +	if (unlikely(has_secure_computing(prev) ||
> +		     has_secure_computing(next))) {
> +		/* slow path here */
> +		if (has_secure_computing(prev) &&
> +		    !has_secure_computing(next)) {
> +			clear_in_cr4(X86_CR4_TSD);
> +		} else if (!has_secure_computing(prev) &&
> +			   has_secure_computing(next))
> +			set_in_cr4(X86_CR4_TSD);
> +	}
> +}
> 
> which it calls from __switch_to().
> 
> The problem is that {set,clear}_in_cr4() both update a single
> global mmu_cr4_features variable, which is asynchronously written
> to all CPUs by {,__}flush_tlb_all(). Hence, the CR4.TSD setting
> is at best probabilistic.

You're right. This won't destabilize the kernel (and it couldn't trigger
in my testing) but it may lead to the tsc to be erroneously disabled on
a non-seccomp task, after a change_page_attr (i.e. insmod) or similar
events using flush_tlb_all (like rmmod). I didn't notice this race
condition sorry (I now recall why we overwrite the cr4 flag in the
global tlb flush: just to flush the global pagetables, since vmalloc
uses global pagetables too).

> I spotted this because perfctr used to flip CR4.PCE in __switch_to()
> ages ago, but I had to abandon that when kernel 2.3.40 changed to
> the current scheme with a global mmu_cr4_features.
> (Another reason was that CR4 writes were and still are very slow.)

Speed is not an issue, cr4 would never be tweaked unless you use
seccomp, the cr4 flip is in an extreme slow path.

I think there are two ways to solve this race:

1) why don't we read the cr4 from the cpu? would movl %%cr4, %%eax
generate a general protection fault? Can the cr4 be read in ring 0?
Why to read it from memory if we've that information in the cpu already?
2) If there's a good reason to read if from memory, then what about
making the mmu_cr4_features per-cpu? That way would solve the problem
too.

Both solutions relay on the fact that the pagetable flush cannot happen
from irqs, so as long as set/clear_in_cr4 is never called from irq (like
in switch_to with this patch), no locking would be required. If the
pagetable flush can be called from irqs (or alternatively if the
set/clear_in_cr4 can be called from irqs) then we'd need to use
test_and_set/clear_bit instead of normal C code despite the structure
being per-cpu, or despite reading the data from the cpu instead of
reading it from memory. In theory we could add a BUG_ON(in_interrupt())
to both, since both set/clear_in_cr4 and the flush_tlb_all aren't fast
paths (probably it worth it just in case).

Comments welcome, thanks!

Re: 2.6.12-rc5-mm1

[Rafael J. Wysocki]

Hi,

On Thursday, 26 of May 2005 09:58, Andrew Morton wrote:
> "J.A. Magallon" <jamagallon@able.es> wrote:
> >
> > 
> > On 05.26, Andrew Morton wrote:
> > > 
> > > (Added alsa-devel to cc)
> > > 
> > > Ed Tomlinson <tomlins@cam.org> wrote:
> > > > 
> > > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> > > > 
> > 
> > Me too. As beep-media-player ends playing a mp3 track, oops !
> 
> hm, OK, you're also on x86_64.  What sound card and driver?

I've got the following on a dual-Opteron box with Tyan Thunder K8W (snd_intel8x0):

Unable to handle kernel paging request at 00002aaaaab2f098 RIP: 
<ffffffff880b5da7>{:snd_pcm:snd_pcm_mmap_data_close+7}
PGD 178b1067 PUD 178b2067 PMD 178a3067 PTE 0
Oops: 0000 [1] SMP 
CPU 0 
Modules linked in: usbserial floppy nvram snd_pcm_oss snd_mixer_oss snd_intel8x0 snd_ac97_codec snd_pcm snd_timer snd soundcore snd_page_alloc ehci_hcd ohci_hcd usbcore joydev sg sr_mod ide_cd cdrom dm_mod parport_pc lp parport
Pid: 4201, comm: artsd Not tainted 2.6.12-rc5-mm1
RIP: 0010:[<ffffffff880b5da7>] <ffffffff880b5da7>{:snd_pcm:snd_pcm_mmap_data_close+7}
RSP: 0018:ffff810017149ed0  EFLAGS: 00010286
RAX: 00002aaaaab2f000 RBX: ffff81001cb2ed08 RCX: ffff810017646b18
RDX: ffff810017646b18 RSI: ffff81001841ead8 RDI: ffff81001841ea88
RBP: ffff81001841ea88 R08: ffff81001cb2ed28 R09: ffff810017149ec8
R10: ffffffffffffffff R11: 0000000000000202 R12: ffff81001cb2ed48
R13: ffff810017dc9418 R14: ffff81003b31e0b8 R15: 00002aaaaab3f000
FS:  00002aaaad039de0(0000) GS:ffffffff8054e840(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00002aaaaab2f098 CR3: 0000000038f5d000 CR4: 00000000000006e0
Process artsd (pid: 4201, threadinfo ffff810017148000, task ffff810017616810)
Stack: ffffffff801705ea 00002aaaaab2f000 0000000000000000 0000000000000000 
       ffff81003b31e0b0 ffff81001841ea88 ffffffff801718c6 ffff81001841e9b8 
       ffff81001841e9d0 ffff81001841e9b8 
Call Trace:<ffffffff801705ea>{remove_vm_struct+106} <ffffffff801718c6>{do_munmap+550}
       <ffffffff8017194d>{sys_munmap+77} <ffffffff8010dc6e>{system_call+126}
       

Code: 48 8b 80 98 00 00 00 f0 ff 88 08 01 00 00 c3 66 66 66 90 66 
RIP <ffffffff880b5da7>{:snd_pcm:snd_pcm_mmap_data_close+7} RSP <ffff810017149ed0>
CR2: 00002aaaaab2f098
 

Greets,
Rafael


-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

Re: 2.6.12-rc5-mm1

[Steven Cole]

Andrew Morton wrote:
> "Martin J. Bligh" <mbligh@mbligh.org> wrote:
> 
>>source kernel/Kconfig.hz is under:
>> menu "APM (Advanced Power Management) BIOS Support"
>> depends on PM && !X86_VISWS
>>
>> So it's screwed if you don't have PM defined, it seems.
> 
> 
> Ah, OK.  Something like this:
> 

FWIW, I had the same error as Martin, and your patch fixed it
for me on my PIII.

Steven

Re: 2.6.12-rc5-mm1

[Mikael Pettersson]

Andrea Arcangeli writes:
 > Speed is not an issue, cr4 would never be tweaked unless you use
 > seccomp, the cr4 flip is in an extreme slow path.
 > 
 > I think there are two ways to solve this race:
 > 
 > 1) why don't we read the cr4 from the cpu? would movl %%cr4, %%eax
 > generate a general protection fault? Can the cr4 be read in ring 0?
 > Why to read it from memory if we've that information in the cpu already?

Yes the kernel can read cr4. I believe the best solution is to modify
__flush_tlb_global() to read cr4's current value and mix it in when
toggling CR4.PGE and uploading mmu_cr4_features.
(But please make it conditional on CONFIG_SECCOMP.)

The code called from __switch_to() would have to set or clear cr4
locally only. That's easy using write_cr4() and read_cr4().

/Mikael

Re: 2.6.12-rc5-mm1

[Andrew Morton]

"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> n Thursday, 26 of May 2005 09:58, Andrew Morton wrote:
>  > "J.A. Magallon" <jamagallon@able.es> wrote:
>  > >
>  > > 
>  > > On 05.26, Andrew Morton wrote:
>  > > > 
>  > > > (Added alsa-devel to cc)
>  > > > 
>  > > > Ed Tomlinson <tomlins@cam.org> wrote:
>  > > > > 
>  > > > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
>  > > > > 
>  > > 
>  > > Me too. As beep-media-player ends playing a mp3 track, oops !
>  > 
>  > hm, OK, you're also on x86_64.  What sound card and driver?
> 
>  I've got the following on a dual-Opteron box with Tyan Thunder K8W (snd_intel8x0):

OK, thanks.  I guess we can set this problem aside for now, as this bug
isn't present in 2.6.12-rc5 (correct?).

I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
possible that it lies elsewhere.  It would be great if someone could fire
up quilt and do a binary search...

To summarise, we have three people (one Opteron, one x86, one
unknown-x86_64) reporting this:


 May 25 21:17:38 grover kernel: [  131.322558] PGD 2ab13067 PUD 2ab1b067 PMD 2a3f1067 PTE 0
 May 25 21:17:38 grover kernel: [  131.351464] CPU 0
 May 25 21:17:38 grover kernel: [  131.358041] Modules linked in: radeon nfsd exportfs lockd sunrpc sg parport_pc lp parport ipv6 sd_
 mod evdev mousedev tsdev usbhid usb_storage snd_intel8x0 snd_ac97_codec snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd soundcore sn
 d_page_alloc ehci_hcd ohci_hcd eth1394 sata_nv libata forcedeth
  ohci1394 powernow_k8 freq_table processor cpufreq_userspace w83627hf eeprom i2c_sensor i2c_isa i2c_nforce2 i2c_core sr_mod sbp2 scs
 i_mod ieee1394 rtc unix
 May 25 21:17:38 grover kernel: [  131.487598] Pid: 5481, comm: artsd Not tainted 2.6.12-rc5-mm1
 May 25 21:17:38 grover kernel: [  131.506496] RIP: 0010:[__nosave_end+129759479/2131247104] <ffffffff8813b8f7>{:snd_pcm:snd_pcm_mmap
 _data_close+7}
 May 25 21:17:38 grover kernel: [  131.535142] RSP: 0018:ffff81002ab9dee0  EFLAGS: 00010286
 May 25 21:17:38 grover kernel: [  131.553183] RAX: 00002aaaadb59000 RBX: ffff810029c64988 RCX: fffffffffffffff2
 May 25 21:17:38 grover kernel: [  131.576657] RDX: ffff810029c64988 RSI: ffff81002d672ce0 RDI: ffff81002b339f50
 May 25 21:17:38 grover kernel: [  131.600129] RBP: ffff81002b3051c0 R08: ffff810029c649a8 R09: ffff81002ab9dec8
 May 25 21:17:38 grover kernel: [  131.623602] R10: 0000000000000002 R11: 0000000000000206 R12: ffff81002b339f50
 May 25 21:17:38 grover kernel: [  131.647075] R13: ffff81002b339f50 R14: ffff81002e7f2a08 R15: 00002aaaadb67000
 May 25 21:17:38 grover kernel: [  131.670548] FS:  00002aaaad6d8f50(0000) GS:ffffffff80550840(0000) knlGS:0000000000000000
 May 25 21:17:38 grover kernel: [  131.697165] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
 May 25 21:17:38 grover kernel: [  131.716064] CR2: 00002aaaadb59098 CR3: 000000002aafd000 CR4: 00000000000006e0
 May 25 21:17:38 grover kernel: [  131.739537] Process artsd (pid: 5481, threadinfo ffff81002ab9c000, task ffff81002ada97f0)
 May 25 21:17:38 grover kernel: [  131.766439] Stack: ffffffff8016942d 0000000000000000 0000000000000000 ffff81002e7f2a00
 May 25 21:17:38 grover kernel: [  131.792174]        ffffffff8016a936 ffff81002d672df0 ffff81002d672e08 ffff81002d672df0
 May 25 21:17:38 grover kernel: [  131.818481]        ffff81002e7f2a00 0000000000560600
 May 25 21:17:38 grover kernel: [  131.835065] Call Trace:<ffffffff8016942d>{remove_vm_struct+125} <ffffffff8016a936>{do_munmap+550}
 May 25 21:17:38 grover kernel: [  131.864282]        <ffffffff8016b0fd>{sys_munmap+77} <ffffffff8010ead6>{system_call+126}
 May 25 21:17:38 grover kernel: [  131.890928]
 May 25 21:17:38 grover kernel: [  131.898387]
 May 25 21:17:38 grover kernel: [  131.898388] Code: 48 8b 80 98 00 00 00 ff 88 08 01 00 00 c3 66 66 66 90 66 66

Re: 2.6.12-rc5-mm1

[Lee Revell]

On Thu, 2005-05-26 at 13:45 -0700, Andrew Morton wrote:
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > n Thursday, 26 of May 2005 09:58, Andrew Morton wrote:
> >  > "J.A. Magallon" <jamagallon@able.es> wrote:
> >  > >
> >  > > 
> >  > > On 05.26, Andrew Morton wrote:
> >  > > > 
> >  > > > (Added alsa-devel to cc)
> >  > > > 
> >  > > > Ed Tomlinson <tomlins@cam.org> wrote:
> >  > > > > 
> >  > > > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> >  > > > > 
> >  > > 
> >  > > Me too. As beep-media-player ends playing a mp3 track, oops !
> >  > 
> >  > hm, OK, you're also on x86_64.  What sound card and driver?
> > 
> >  I've got the following on a dual-Opteron box with Tyan Thunder K8W (snd_intel8x0):
> 
> OK, thanks.  I guess we can set this problem aside for now, as this bug
> isn't present in 2.6.12-rc5 (correct?).
> 
> I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
> possible that it lies elsewhere.

See the "Patch avoiding-mmap-fragmentation-fix-2.patch oops" thread.

Lee

Re: 2.6.12-rc5-mm1

[Chris Wright]

* Andrew Morton (akpm@osdl.org) wrote:
> I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
> possible that it lies elsewhere.  It would be great if someone could fire
> up quilt and do a binary search...

I had started that, but then read a few accounts of backing out
avoiding-mmap-fragmentation-fix-2.patch fixing the problem.  Both that
patch and alsa are using vm_private_data.  Madness ensues.

Re: 2.6.12-rc5-mm1

[J.A. Magallon]

On 05.26, Andrew Morton wrote:
> "J.A. Magallon" <jamagallon@able.es> wrote:
> >
> > 
> > On 05.26, Andrew Morton wrote:
> > > 
> > > (Added alsa-devel to cc)
> > > 
> > > Ed Tomlinson <tomlins@cam.org> wrote:
> > > > 
> > > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> > > > 
> > 
> > Me too. As beep-media-player ends playing a mp3 track, oops !
> 
> hm, OK, you're also on x86_64.  What sound card and driver?
> 

Sorry for the late answer...

No, I'm ia32. Dual Xeon.

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc5-mm1

[Andrea Arcangeli]

On Thu, May 26, 2005 at 09:15:26PM +0200, Mikael Pettersson wrote:
> (But please make it conditional on CONFIG_SECCOMP.)

Why should it be conditional? Isn't it faster to read it from the cpu
itself instead of reading it from slow ram? That info is cold in the
cache when the global tlb flush is invoked, while it's always in hot in
the cpu. Perhaps the cpu is dogslow at reading cr4 or what?

Note that the whole mmu_cr4 thing seems pretty flawed if used at
runtime, that's only necessary to initialize new cpus (head.S). So
basically at runtime nobody should read or write to mmu_cr4_features
global variable.

> The code called from __switch_to() would have to set or clear cr4
> locally only. That's easy using write_cr4() and read_cr4().

Agreed.

Re: 2.6.12-rc5-mm1

[Andrea Arcangeli]

Here an update that passed successfully basic testing verifying task
gets killed with sig11 if rdtsc is used in seccomp mode on x86-64 (i686
still untested but fully symmetric).

From: Andrea Arcangeli <andrea@cpushare.com>

I believe at least for seccomp it's worth to turn off the tsc, not just for
HT but for the L2 cache too.  So it's up to you, either you turn it off
completely (which isn't very nice IMHO) or I recommend to apply this below
patch.

This has been tested successfully on x86-64 against current cogito
repository (i686 compiles so I didn't bother testing ;).  People selling
the cpu through cpushare may appreciate this bit for a peace of mind. 

There's no way to get any timing info anymore with this applied
(gettimeofday is forbidden of course).  The seccomp environment is
completely deterministic so it can't be allowed to get timing info, it has
to be deterministic so in the future I can enable a computing mode that
does a parallel computing for each task with server side transparent
checkpointing and verification that the output is the same from all the 2/3
seller computers for each task, without the buyer even noticing (for now
the verification is left to the buyer client side and there's no
checkpointing, since that would require more kernel changes to track the
dirty bits but it'll be easy to extend once the basic mode is finished).

Eliminating a cold-cache read of the cr4 global variable will save one
cacheline during the tlb flush while making the code per-cpu-safe at the
same time. Thanks to Mikael Pettersson for noticing the tlb flush wasn't
per-cpu-safe. 

The global tlb flush can run from irq (IPI calling do_flush_tlb_all) but
it'll be transparent to the switch_to code since the IPI won't make any
change to the cr4 contents from the point of view of the interrupted
code and since it's now all per-cpu stuff, it will not race. So no need
to disable irqs in switch_to slow path.

Signed-off-by: Andrea Arcangeli <andrea@cpushare.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/kernel/process.c   |   21 +++++++++++++++++++++
 arch/x86_64/kernel/process.c |   21 +++++++++++++++++++++
 include/linux/seccomp.h      |    6 ++++++
 3 files changed, 48 insertions(+)

Index: arch/i386/kernel/process.c
===================================================================
--- 3ac9a34948049bff79a2b2ce49c0a3c84e35a748/arch/i386/kernel/process.c  (mode:100644)
+++ uncommitted/arch/i386/kernel/process.c  (mode:100644)
@@ -561,6 +561,25 @@
 }
 
 /*
+ * This function selects if the context switch from prev to next
+ * has to tweak the TSC disable bit in the cr4.
+ */
+static void disable_tsc(struct thread_info *prev,
+			struct thread_info *next)
+{
+	if (unlikely(has_secure_computing(prev) ||
+		     has_secure_computing(next))) {
+		/* slow path here */
+		if (has_secure_computing(prev) &&
+		    !has_secure_computing(next)) {
+			write_cr4(read_cr4() & ~X86_CR4_TSD);
+		} else if (!has_secure_computing(prev) &&
+			   has_secure_computing(next))
+			write_cr4(read_cr4() | X86_CR4_TSD);
+	}
+}
+
+/*
  *	switch_to(x,yn) should switch tasks from x to y.
  *
  * We fsave/fwait so that an exception goes off at the right time
@@ -639,6 +658,8 @@
 	if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr))
 		handle_io_bitmap(next, tss);
 
+	disable_tsc(prev_p->thread_info, next_p->thread_info);
+
 	return prev_p;
 }
 
Index: arch/x86_64/kernel/process.c
===================================================================
--- 3ac9a34948049bff79a2b2ce49c0a3c84e35a748/arch/x86_64/kernel/process.c  (mode:100644)
+++ uncommitted/arch/x86_64/kernel/process.c  (mode:100644)
@@ -439,6 +439,25 @@
 }
 
 /*
+ * This function selects if the context switch from prev to next
+ * has to tweak the TSC disable bit in the cr4.
+ */
+static void disable_tsc(struct thread_info *prev,
+			struct thread_info *next)
+{
+	if (unlikely(has_secure_computing(prev) ||
+		     has_secure_computing(next))) {
+		/* slow path here */
+		if (has_secure_computing(prev) &&
+		    !has_secure_computing(next)) {
+			write_cr4(read_cr4() & ~X86_CR4_TSD);
+		} else if (!has_secure_computing(prev) &&
+			   has_secure_computing(next))
+			write_cr4(read_cr4() | X86_CR4_TSD);
+	}
+}
+
+/*
  * This special macro can be used to load a debugging register
  */
 #define loaddebug(thread,r) set_debug(thread->debugreg ## r, r)
@@ -556,6 +575,8 @@
 		}
 	}
 
+	disable_tsc(prev_p->thread_info, next_p->thread_info);
+
 	return prev_p;
 }
 
Index: include/asm-i386/tlbflush.h
===================================================================
--- 3ac9a34948049bff79a2b2ce49c0a3c84e35a748/include/asm-i386/tlbflush.h  (mode:100644)
+++ uncommitted/include/asm-i386/tlbflush.h  (mode:100644)
@@ -22,16 +22,18 @@
  */
 #define __flush_tlb_global()						\
 	do {								\
-		unsigned int tmpreg;					\
+		unsigned int tmpreg, cr4, cr4_orig;			\
 									\
 		__asm__ __volatile__(					\
-			"movl %1, %%cr4;  # turn off PGE     \n"	\
+			"movl %%cr4, %2;  # turn off PGE     \n"	\
+			"movl %2, %1;                        \n"	\
+			"andl %3, %1;                        \n"	\
+			"movl %1, %%cr4;                     \n"	\
 			"movl %%cr3, %0;                     \n"	\
 			"movl %0, %%cr3;  # flush TLB        \n"	\
 			"movl %2, %%cr4;  # turn PGE back on \n"	\
-			: "=&r" (tmpreg)				\
-			: "r" (mmu_cr4_features & ~X86_CR4_PGE),	\
-			  "r" (mmu_cr4_features)			\
+			: "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig)	\
+			: "i" (~X86_CR4_PGE)				\
 			: "memory");					\
 	} while (0)
 
Index: include/asm-x86_64/tlbflush.h
===================================================================
--- 3ac9a34948049bff79a2b2ce49c0a3c84e35a748/include/asm-x86_64/tlbflush.h  (mode:100644)
+++ uncommitted/include/asm-x86_64/tlbflush.h  (mode:100644)
@@ -22,16 +22,18 @@
  */
 #define __flush_tlb_global()						\
 	do {								\
-		unsigned long tmpreg;					\
+		unsigned long tmpreg, cr4, cr4_orig;			\
 									\
 		__asm__ __volatile__(					\
-			"movq %1, %%cr4;  # turn off PGE     \n"	\
+			"movq %%cr4, %2;  # turn off PGE     \n"	\
+			"movq %2, %1;                        \n"	\
+			"andq %3, %1;                        \n"	\
+			"movq %1, %%cr4;                     \n"	\
 			"movq %%cr3, %0;  # flush TLB        \n"	\
 			"movq %0, %%cr3;                     \n"	\
 			"movq %2, %%cr4;  # turn PGE back on \n"	\
-			: "=&r" (tmpreg)				\
-			: "r" (mmu_cr4_features & ~X86_CR4_PGE),	\
-			  "r" (mmu_cr4_features)			\
+			: "=&r" (tmpreg), "=&r" (cr4), "=&r" (cr4_orig)	\
+			: "i" (~X86_CR4_PGE)				\
 			: "memory");					\
 	} while (0)
 
Index: include/linux/seccomp.h
===================================================================
--- 3ac9a34948049bff79a2b2ce49c0a3c84e35a748/include/linux/seccomp.h  (mode:100644)
+++ uncommitted/include/linux/seccomp.h  (mode:100644)
@@ -19,6 +19,11 @@
 		__secure_computing(this_syscall);
 }
 
+static inline int has_secure_computing(struct thread_info *ti)
+{
+	return unlikely(test_ti_thread_flag(ti, TIF_SECCOMP));
+}
+
 #else /* CONFIG_SECCOMP */
 
 #if (__GNUC__ > 2)
@@ -28,6 +33,7 @@
 #endif
 
 #define secure_computing(x) do { } while (0)
+#define has_secure_computing(x) 0
 
 #endif /* CONFIG_SECCOMP */
 

Re: 2.6.12-rc5-mm1

[Rafael J. Wysocki]

On Thursday, 26 of May 2005 22:45, Andrew Morton wrote:
> "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > n Thursday, 26 of May 2005 09:58, Andrew Morton wrote:
> >  > "J.A. Magallon" <jamagallon@able.es> wrote:
> >  > >
> >  > > 
> >  > > On 05.26, Andrew Morton wrote:
> >  > > > 
> >  > > > (Added alsa-devel to cc)
> >  > > > 
> >  > > > Ed Tomlinson <tomlins@cam.org> wrote:
> >  > > > > 
> >  > > > > Got the following when I tried to use sound.  Anyone else see problems in alsa land?
> >  > > > > 
> >  > > 
> >  > > Me too. As beep-media-player ends playing a mp3 track, oops !
> >  > 
> >  > hm, OK, you're also on x86_64.  What sound card and driver?
> > 
> >  I've got the following on a dual-Opteron box with Tyan Thunder K8W (snd_intel8x0):
> 
> OK, thanks.  I guess we can set this problem aside for now, as this bug
> isn't present in 2.6.12-rc5 (correct?).

Yup.

> I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
> possible that it lies elsewhere.

Well, yes.  Apparently, it goes away if you revert the following patch:

avoiding-mmap-fragmentation-fix-2.patch

Greets,
Rafael


-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

RE: 2.6.12-rc5-mm1

[Chen, Kenneth W]

Rafael J. Wysocki wrote on Friday, May 27, 2005 3:29 AM
> > I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
> > possible that it lies elsewhere.
> 
> Well, yes.  Apparently, it goes away if you revert the following patch:
> 
> avoiding-mmap-fragmentation-fix-2.patch


avoiding-mmap-fragmentation-fix-2.patch has a major clash using
vm_private_data where alsa is also using.  I just posted a patch,
please try that out.  Thanks.

http://marc.theaimsgroup.com/?l=linux-mm&m=111721191501940&w=2

- Ken

Re: 2.6.12-rc5-mm1

[Arnd Bergmann]

On Middeweken 25 Mai 2005 22:49, Andrew Morton wrote:
> 
> - New Xtensa architecture: Tensilica Xtensa CPU series.

I noticed this has another copy of all the backwards compatibility
syscalls in its arch/*/kernel/syscall.c file. This doesn't make
sense for a new architecture added to the tree.

Chris, are there any existing binaries that rely on your implementations
of old_mmap, sys_fork, sys_vfork, sys_olduname or sys_ipc and need to
work with future kernels? Otherwise, you should probably drop these.
For sys_ipc, you would need to add the subcalls directly to the table,
like parisc does.

	Arnd <><

Re: 2.6.12-rc5-mm1

[J.A. Magallon]

On 05.27, Chen, Kenneth W wrote:
> Rafael J. Wysocki wrote on Friday, May 27, 2005 3:29 AM
> > > I assume the problem is due to one of the ASLA patches in rc5-mm1, but it's
> > > possible that it lies elsewhere.
> > 
> > Well, yes.  Apparently, it goes away if you revert the following patch:
> > 
> > avoiding-mmap-fragmentation-fix-2.patch
> 
> 
> avoiding-mmap-fragmentation-fix-2.patch has a major clash using
> vm_private_data where alsa is also using.  I just posted a patch,
> please try that out.  Thanks.
> 
> http://marc.theaimsgroup.com/?l=linux-mm&m=111721191501940&w=2
> 

This makes my oopses go away in beep-media-player.
Thanks!

--
J.A. Magallon <jamagallon()able!es>     \               Software is like sex:
werewolf!able!es                         \         It's better when it's free
Mandriva Linux release 2006.0 (Cooker) for i586
Linux 2.6.11-jam20 (gcc 4.0.0 (4.0.0-3mdk for Mandriva Linux release 2006.0))

Re: 2.6.12-rc5-mm1

[Christoph Hellwig]

On Fri, May 27, 2005 at 11:13:19PM +0200, Arnd Bergmann wrote:
> On Middeweken 25 Mai 2005 22:49, Andrew Morton wrote:
> > 
> > - New Xtensa architecture: Tensilica Xtensa CPU series.
> 
> I noticed this has another copy of all the backwards compatibility
> syscalls in its arch/*/kernel/syscall.c file. This doesn't make
> sense for a new architecture added to the tree.
> 
> Chris, are there any existing binaries that rely on your implementations
> of old_mmap, sys_fork, sys_vfork, sys_olduname or sys_ipc and need to
> work with future kernels? Otherwise, you should probably drop these.
> For sys_ipc, you would need to add the subcalls directly to the table,
> like parisc does.

We should do that either way.  If people have existing binaries relying
on broken thing before submitting ports for review it's their fault.

Re: 2.6.12-rc5-mm1

[Stefano Rivoir]

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

Alle 22:49, mercoledì 25 maggio 2005, Andrew Morton ha scritto:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc5/2.

Hi all,

I have 2 problems with 2.6.12-rc5-mm1:

1. glxinfo causes a bad error:

May 30 15:02:41 nbsteu kernel: Unable to handle kernel NULL pointer dereference at virtual address 00000000
May 30 15:02:41 nbsteu kernel:  printing eip:
May 30 15:02:41 nbsteu kernel: c013e16d
May 30 15:02:41 nbsteu kernel: *pde = 00000000
May 30 15:02:41 nbsteu kernel: Oops: 0000 [#1]
May 30 15:02:41 nbsteu kernel: PREEMPT
May 30 15:02:41 nbsteu kernel: Modules linked in: radeon drm sd_mod scsi_mod lp hotkey fan button ide_cd 8250_pnp parport_pc parport floppy pcspkr sk98lin yenta_socket rsrc_nonstatic pcmcia_core ehci_hcd usbhid ohci_hcd snd_intel8x0m 8250_pci 8250 serial_core ohci1394 ieee1394 sis_agp agpgart vfat fat video thermal processor ac battery evdev snd_intel8x0 snd_ac97_codec snd_pcm_oss snd_mixer_oss snd_pcm snd_timer snd soundcore snd_page_alloc skge
May 30 15:02:41 nbsteu kernel: CPU:    0
May 30 15:02:41 nbsteu kernel: EIP:    0060:[kfree+45/96]    Not tainted VLI
May 30 15:02:41 nbsteu kernel: EFLAGS: 00210002   (2.6.12-rc5-mm1)
May 30 15:02:41 nbsteu kernel: EIP is at kfree+0x2d/0x60
May 30 15:02:41 nbsteu kernel: eax: 00000000   ebx: db7ae720   ecx: db7ae400   edx: c1000000
May 30 15:02:41 nbsteu kernel: esi: b7f4f000   edi: 00200286   ebp: b7f4f000   esp: d203bf30
May 30 15:02:41 nbsteu kernel: ds: 007b   es: 007b   ss: 0068
May 30 15:02:41 nbsteu kernel: Process glxinfo (pid: 4809, threadinfo=d203a000 task=d4ea1030)
May 30 15:02:41 nbsteu kernel: Stack: db7ae720 00000000 de567800 e1a2a736 c0142ee2 b7f3d000 b7f4f000 d27a3ee0
May 30 15:02:41 nbsteu kernel:        db7ae680 b7f4f000 de567800 d203a000 d350b180 d27a3438 d27a3438 c0145f36
May 30 15:02:41 nbsteu kernel:        00000000 de780300 de780300 c01476ea b7f4f000 b7f4d000 c0147a7a b7f4d000
May 30 15:02:41 nbsteu kernel: Call Trace:
May 30 15:02:41 nbsteu kernel:  [pg0+560449334/1069876224] drm_vm_shm_close+0x216/0x2c0 [drm]
May 30 15:02:41 nbsteu kernel:  [free_pgtables+98/128] free_pgtables+0x62/0x80
May 30 15:02:41 nbsteu kernel:  [remove_vm_struct+118/128] remove_vm_struct+0x76/0x80
May 30 15:02:41 nbsteu kernel:  [unmap_vma_list+26/48] unmap_vma_list+0x1a/0x30
May 30 15:02:41 nbsteu kernel:  [do_munmap+250/304] do_munmap+0xfa/0x130
May 30 15:02:41 nbsteu kernel:  [sys_munmap+64/112] sys_munmap+0x40/0x70
May 30 15:02:41 nbsteu kernel:  [sysenter_past_esp+84/117] sysenter_past_esp+0x54/0x75
May 30 15:02:41 nbsteu kernel: Code: 0c 85 c0 89 74 24 04 89 c6 89 1c 24 89 7c 24 08 74 2a 9c 5f fa 8b 15 50 db 39 c0 8d 80 00 00 00 40 c1 e8 0c c1 e0 05 8b 44 02 18 <8b> 18 8b 13 3b 53 04 73 17 89 74 93 10 ff 03 57 9d 8b 1c 24 8b

2. ASUS ACPI is not working anymore (this since some -mm ago), modprobe asus_acpi 
fails to load saying a generic "No such device"

Note that both 1. and 2. work on plain 2.6.12-rc5, and 1. was fine in
2.6.12-rc4-mm*

Attached lspci-v and .config

Bye.

-- 
Stefano Rivoir

[-- Attachment #2: .config.kernel.2.6.12-rc5-mm1 --]
[-- Type: text/plain, Size: 31397 bytes --]

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12-rc5-mm1
# Thu May 26 11:14:53 2005
#
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
# CONFIG_CLEAN_COMPILE is not set
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32

#
# General setup
#
CONFIG_LOCALVERSION=""
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SHMEM=y
CONFIG_CC_ALIGN_FUNCTIONS=0
CONFIG_CC_ALIGN_LABELS=0
CONFIG_CC_ALIGN_LOOPS=0
CONFIG_CC_ALIGN_JUMPS=0
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0

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

#
# Processor type and features
#
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 is not set
CONFIG_MPENTIUM4=y
# 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_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=7
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_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
# CONFIG_HPET_TIMER is not set
# CONFIG_SMP is not set
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
# CONFIG_X86_UP_APIC is not set
CONFIG_X86_TSC=y
CONFIG_X86_MCE=y
# CONFIG_X86_MCE_NONFATAL is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set

#
# Firmware Drivers
#
# CONFIG_EDD is not set
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
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_HAVE_ARCH_EARLY_PFN_TO_NID=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_HAVE_DEC_LOCK=y
CONFIG_REGPARM=y
CONFIG_SECCOMP=y

#
# Performance-monitoring counters support
#
# CONFIG_PERFCTR is not set
CONFIG_PHYSICAL_START=0x100000
# CONFIG_KEXEC is not set

#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
# CONFIG_SOFTWARE_SUSPEND is not set

#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=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=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_ASUS=m
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
# CONFIG_ACPI_CUSTOM_DSDT is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_BUS=y
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_PCI=y
CONFIG_ACPI_SYSTEM=y
# CONFIG_X86_PM_TIMER is not set
# CONFIG_ACPI_CONTAINER is not set

#
# APM (Advanced Power Management) BIOS Support
#
# CONFIG_APM is not set
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250

#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ 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_LEGACY_PROC is not set
CONFIG_PCI_NAMES=y
# 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=m
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=m
CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
CONFIG_CARDBUS=y

#
# PC-card bridges
#
CONFIG_YENTA=m
# CONFIG_PD6729 is not set
# CONFIG_I82092 is not set
# CONFIG_TCIC is not set
CONFIG_PCCARD_NONSTATIC=m

#
# PCI Hotplug Support
#
CONFIG_HOTPLUG_PCI=m
# CONFIG_HOTPLUG_PCI_FAKE is not set
# CONFIG_HOTPLUG_PCI_COMPAQ is not set
CONFIG_HOTPLUG_PCI_ACPI=m
# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
# CONFIG_HOTPLUG_PCI_CPCI is not set
# CONFIG_HOTPLUG_PCI_SHPC is not set

#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m

#
# Device Drivers
#

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

#
# Connector - unified userspace <-> kernelspace linker
#
CONFIG_CONNECTOR=y
CONFIG_FORK_CONNECTOR=y

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

#
# Parallel port support
#
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
# CONFIG_PARPORT_SERIAL is not set
# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC_SUPERIO is not set
# CONFIG_PARPORT_PC_PCMCIA is not set
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 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=m
# CONFIG_PARIDE 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 is not set
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=y
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set

#
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
# CONFIG_ATA_OVER_ETH is not set

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

#
# 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=y
CONFIG_IDEDISK_MULTI_MODE=y
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=m
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_BLK_DEV_IDESCSI is not set
# CONFIG_IDE_TASK_IOCTL is not set

#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
# CONFIG_BLK_DEV_CMD640 is not set
CONFIG_BLK_DEV_IDEPNP=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=y
# 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_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX 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=y
# 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_SCSI=m
CONFIG_SCSI_PROC_FS=y

#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SD=m
# 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 is not set
# CONFIG_SCSI_LOGGING is not set

#
# SCSI Transport Attributes
#
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set

#
# SCSI low-level drivers
#
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_ARCMSR 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_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_CPQFCTS is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_EATA_PIO 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_PPA is not set
# CONFIG_SCSI_IMM is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_QLOGIC_ISP is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_QLA21XX is not set
# CONFIG_SCSI_QLA22XX is not set
# CONFIG_SCSI_QLA2300 is not set
# CONFIG_SCSI_QLA2322 is not set
# CONFIG_SCSI_QLA6312 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

#
# 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

#
# 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

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

#
# Subsystem Options
#
# CONFIG_IEEE1394_VERBOSEDEBUG is not set
# CONFIG_IEEE1394_OUI_DB is not set
# CONFIG_IEEE1394_EXTRA_CONFIG_ROMS is not set

#
# Device Drivers
#

#
# Texas Instruments PCILynx requires I2C
#
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 is not set
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m
CONFIG_IEEE1394_CMP=m
CONFIG_IEEE1394_AMDTP=m

#
# I2O device support
#
# CONFIG_I2O is not set

#
# Networking support
#
CONFIG_NET=y

#
# Networking options
#
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
CONFIG_SYN_COOKIES=y
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_TUNNEL is not set
# CONFIG_IP_TCPDIAG is not set
# CONFIG_IP_TCPDIAG_IPV6 is not set

#
# IP: Virtual Server Configuration
#
# CONFIG_IP_VS is not set
# CONFIG_IPV6 is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
# CONFIG_IP_NF_CT_ACCT is not set
# CONFIG_IP_NF_CONNTRACK_MARK is not set
# CONFIG_IP_NF_CT_PROTO_SCTP is not set
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
# CONFIG_IP_NF_TFTP is not set
# CONFIG_IP_NF_AMANDA is not set
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
# CONFIG_IP_NF_MATCH_IPRANGE is not set
CONFIG_IP_NF_MATCH_MAC=m
# CONFIG_IP_NF_MATCH_PKTTYPE is not set
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
# CONFIG_IP_NF_MATCH_TOS is not set
# CONFIG_IP_NF_MATCH_RECENT is not set
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_DSCP is not set
# CONFIG_IP_NF_MATCH_AH_ESP is not set
# CONFIG_IP_NF_MATCH_LENGTH is not set
# CONFIG_IP_NF_MATCH_TTL is not set
# CONFIG_IP_NF_MATCH_TCPMSS is not set
# CONFIG_IP_NF_MATCH_HELPER is not set
CONFIG_IP_NF_MATCH_STATE=m
# CONFIG_IP_NF_MATCH_CONNTRACK is not set
# CONFIG_IP_NF_MATCH_OWNER is not set
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
# CONFIG_IP_NF_MATCH_REALM is not set
# CONFIG_IP_NF_MATCH_SCTP is not set
# CONFIG_IP_NF_MATCH_COMMENT is not set
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
# CONFIG_IP_NF_TARGET_ULOG is not set
# CONFIG_IP_NF_TARGET_TCPMSS is not set
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 is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
# CONFIG_IP_NF_TARGET_ECN is not set
# CONFIG_IP_NF_TARGET_DSCP is not set
# CONFIG_IP_NF_TARGET_MARK is not set
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set

#
# SCTP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# 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 is not set

#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
# CONFIG_NET_CLS_ROUTE is not set

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_KGDBOE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
# CONFIG_NET_POLL_CONTROLLER is not set
# CONFIG_HAMRADIO is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_IEEE80211 is not set
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_NET_SB1000 is not set

#
# ARCnet devices
#
# CONFIG_ARCNET is not set

#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM 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=m
# CONFIG_E100 is not set
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
CONFIG_NE2K_PCI=m
CONFIG_8139CP=m
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
# CONFIG_8139TOO_8129 is not set
# CONFIG_8139_OLD_RX_RESET 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_SKGE=m
CONFIG_SK98LIN=m
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set

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

#
# Token Ring devices
#
# CONFIG_TR is not set

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

#
# 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_PLIP is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set

#
# ISDN subsystem
#
# CONFIG_ISDN is not set

#
# Telephony Support
#
# CONFIG_PHONE is not set

#
# Input device support
#
CONFIG_INPUT=y

#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=y
# CONFIG_INPUT_TSDEV is not set
CONFIG_INPUT_EVDEV=m
# 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_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_VSXXXAA is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
# CONFIG_INPUT_UINPUT is not set

#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set

#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set

#
# Serial drivers
#
CONFIG_SERIAL_8250=m
# CONFIG_SERIAL_8250_CS is not set
# CONFIG_SERIAL_8250_ACPI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set

#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=m
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
# CONFIG_TIPAR is not set

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m
# CONFIG_NVRAM is not set
# CONFIG_RTC is not set
# CONFIG_GEN_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set

#
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
CONFIG_AGP=m
# 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 is not set
# CONFIG_AGP_NVIDIA is not set
CONFIG_AGP_SIS=m
# 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_GAMMA is not set
# CONFIG_DRM_R128 is not set
CONFIG_DRM_RADEON=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set

#
# PCMCIA character devices
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_MWAVE is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set

#
# TPM devices
#
# CONFIG_TCG_TPM is not set

#
# I2C support
#
# CONFIG_I2C is not set

#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set

#
# Misc devices
#
# CONFIG_IBM_ASM is not set

#
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set

#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set

#
# Graphics support
#
CONFIG_FB=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
# CONFIG_FB_VESA is not set
CONFIG_VIDEO_SELECT=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_I810 is not set
# CONFIG_FB_INTEL is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON_OLD is not set
CONFIG_FB_RADEON=y
# CONFIG_FB_RADEON_I2C is not set
# CONFIG_FB_RADEON_DEBUG 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_TRIDENT is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
CONFIG_FONT_8x16=y
CONFIG_FONT_6x11=y
CONFIG_FONT_PEARL_8x8=y
CONFIG_FONT_ACORN_8x8=y
CONFIG_FONT_MINI_4x6=y
CONFIG_FONT_SUN8x16=y
CONFIG_FONT_SUN12x22=y

#
# Logo configuration
#
# CONFIG_LOGO is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set

#
# Sound
#
CONFIG_SOUND=m

#
# Advanced Linux Sound Architecture
#
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_SEQUENCER=m
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set

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

#
# PCI devices
#
CONFIG_SND_AC97_CODEC=m
# 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_CS46XX is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_EMU10K1X is not set
# CONFIG_SND_CA0106 is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_MIXART is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_TRIDENT is not set
# CONFIG_SND_YMFPCI is not set
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_CMIPCI 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_MAESTRO3 is not set
# CONFIG_SND_FM801 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_SONICVIBES is not set
# CONFIG_SND_VIA82XX is not set
# CONFIG_SND_VIA82XX_MODEM is not set
# CONFIG_SND_VX222 is not set
# CONFIG_SND_HDA_INTEL is not set

#
# USB devices
#
# CONFIG_SND_USB_AUDIO is not set
# CONFIG_SND_USB_USX2Y is not set

#
# PCMCIA devices
#

#
# 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=y
# CONFIG_USB_DEBUG is not set

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

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

#
# USB Device Class drivers
#
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
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=y
# CONFIG_USB_STORAGE_SDDR09 is not set
# CONFIG_USB_STORAGE_SDDR55 is not set
# CONFIG_USB_STORAGE_JUMPSHOT is not set

#
# USB Input Devices
#
CONFIG_USB_HID=m
CONFIG_USB_HIDINPUT=y
# CONFIG_HID_FF is not set
CONFIG_USB_HIDDEV=y

#
# USB HID Boot Protocol drivers
#
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_MTOUCH is not set
# CONFIG_USB_ITMTOUCH is not set
# CONFIG_USB_EGALAX is not set
# CONFIG_USB_XPAD is not set
# CONFIG_USB_ATI_REMOTE is not set

#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set

#
# USB Multimedia devices
#
# CONFIG_USB_DABUSB is not set

#
# Video4Linux support is needed for USB Multimedia device support
#

#
# 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 is not set

#
# USB port drivers
#
# CONFIG_USB_USS720 is not set

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

#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_PHIDGETKIT is not set
# CONFIG_USB_PHIDGETSERVO is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_TEST is not set

#
# USB DSL modem support
#

#
# USB Gadget Support
#
# CONFIG_USB_GADGET is not set

#
# MMC/SD Card support
#
# CONFIG_MMC is not set

#
# InfiniBand support
#
# CONFIG_INFINIBAND is not set

#
# SN Devices
#

#
# Distributed Lock Manager
#
# CONFIG_DLM is not set

#
# File systems
#
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
# CONFIG_REISER4_FS is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set

#
# XFS support
#
# CONFIG_XFS_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_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set

#
# Caches
#
# CONFIG_FSCACHE is not set
# CONFIG_FUSE_FS is not set

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_ZISOFS_FS=m
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="iso8859-1"
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
CONFIG_NTFS_RW=y

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set
# CONFIG_DEVPTS_FS_XATTR is not set
# CONFIG_TMPFS is not set
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_CONFIGFS_FS is not set
# CONFIG_RELAYFS_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 is not set

#
# Network File Systems
#
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set

#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y

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

#
# Profiling support
#
# CONFIG_PROFILING is not set

#
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOG_BUF_SHIFT=15
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_INFO is not set
# CONFIG_PAGE_OWNER is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_FRAME_POINTER is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_KPROBES is not set
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_4KSTACKS is not set
# CONFIG_KGDB is not set

#
# Security options
#
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set

#
# Cryptographic options
#
# CONFIG_CRYPTO is not set

#
# Hardware crypto devices
#

#
# Library routines
#
# CONFIG_CRC_CCITT is not set
CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set
CONFIG_ZLIB_INFLATE=m
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_PC=y

[-- Attachment #3: lspciv --]
[-- Type: text/plain, Size: 5605 bytes --]

0000:00:00.0 Host bridge: Silicon Integrated Systems [SiS] SiS 645xx (rev 03)
	Subsystem: Asustek Computer, Inc.: Unknown device 1738
	Flags: bus master, medium devsel, latency 32
	Memory at e8000000 (32-bit, non-prefetchable) [size=64M]
	Capabilities: [c0] AGP version 2.0

0000:00:01.0 PCI bridge: Silicon Integrated Systems [SiS] Virtual PCI-to-PCI bridge (AGP) (prog-if 00 [Normal decode])
	Flags: bus master, fast devsel, latency 0
	Bus: primary=00, secondary=01, subordinate=01, sec-latency=0
	I/O behind bridge: 0000d000-0000dfff
	Memory behind bridge: e7800000-e7ffffff
	Prefetchable memory behind bridge: eff00000-febfffff

0000:00:02.0 ISA bridge: Silicon Integrated Systems [SiS] SiS963 [MuTIOL Media IO] (rev 14)
	Flags: bus master, medium devsel, latency 0

0000:00:02.1 SMBus: Silicon Integrated Systems [SiS]: Unknown device 0016
	Flags: medium devsel
	I/O ports at e800 [size=32]

0000:00:02.3 FireWire (IEEE 1394): Silicon Integrated Systems [SiS] FireWire Controller (prog-if 10 [OHCI])
	Subsystem: Asustek Computer, Inc.: Unknown device 1737
	Flags: bus master, medium devsel, latency 32, IRQ 11
	Memory at e7000000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: [64] Power Management version 2

0000:00:02.5 IDE interface: Silicon Integrated Systems [SiS] 5513 [IDE] (prog-if 80 [Master])
	Subsystem: Asustek Computer, Inc.: Unknown device 1738
	Flags: bus master, medium devsel, latency 32
	I/O ports at b800 [size=16]
	Capabilities: [58] Power Management version 2

0000:00:02.6 Modem: Silicon Integrated Systems [SiS] AC'97 Modem Controller (rev a0) (prog-if 00 [Generic])
	Subsystem: Asustek Computer, Inc.: Unknown device 1736
	Flags: bus master, medium devsel, latency 32, IRQ 11
	I/O ports at b400 [size=256]
	I/O ports at b000 [size=128]
	Capabilities: [48] Power Management version 2

0000:00:02.7 Multimedia audio controller: Silicon Integrated Systems [SiS] Sound Controller (rev a0)
	Subsystem: Asustek Computer, Inc.: Unknown device 1733
	Flags: bus master, medium devsel, latency 32, IRQ 11
	I/O ports at a800 [size=256]
	I/O ports at a400 [size=128]
	Capabilities: [48] Power Management version 2

0000:00:03.0 USB Controller: Silicon Integrated Systems [SiS] USB 1.0 Controller (rev 0f) (prog-if 10 [OHCI])
	Subsystem: Asustek Computer, Inc.: Unknown device 1739
	Flags: bus master, medium devsel, latency 32, IRQ 5
	Memory at e6800000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: [dc] Power Management version 2

0000:00:03.1 USB Controller: Silicon Integrated Systems [SiS] USB 1.0 Controller (rev 0f) (prog-if 10 [OHCI])
	Subsystem: Asustek Computer, Inc.: Unknown device 1739
	Flags: bus master, medium devsel, latency 32, IRQ 5
	Memory at e6000000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: [dc] Power Management version 2

0000:00:03.2 USB Controller: Silicon Integrated Systems [SiS] USB 1.0 Controller (rev 0f) (prog-if 10 [OHCI])
	Subsystem: Asustek Computer, Inc.: Unknown device 1739
	Flags: bus master, medium devsel, latency 32, IRQ 5
	Memory at e5800000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: [dc] Power Management version 2

0000:00:03.3 USB Controller: Silicon Integrated Systems [SiS] USB 2.0 Controller (prog-if 20 [EHCI])
	Subsystem: Asustek Computer, Inc.: Unknown device 173a
	Flags: bus master, medium devsel, latency 32, IRQ 5
	Memory at e5000000 (32-bit, non-prefetchable) [size=4K]
	Capabilities: [50] Power Management version 2

0000:00:0a.0 CardBus bridge: ENE Technology Inc CB720 Cardbus Controller (rev 01)
	Subsystem: Asustek Computer, Inc.: Unknown device 1734
	Flags: bus master, medium devsel, latency 168, IRQ 11
	Memory at 20000000 (32-bit, non-prefetchable) [size=4K]
	Bus: primary=00, secondary=02, subordinate=05, sec-latency=176
	Memory window 0: 20400000-207ff000 (prefetchable)
	Memory window 1: 20800000-20bff000
	I/O window 0: 00004000-000040ff
	I/O window 1: 00004400-000044ff
	16-bit legacy interface ports at 0001

0000:00:0a.1 CardBus bridge: ENE Technology Inc CB720 Cardbus Controller (rev 01)
	Subsystem: Asustek Computer, Inc.: Unknown device 1734
	Flags: bus master, medium devsel, latency 168, IRQ 11
	Memory at 20001000 (32-bit, non-prefetchable) [size=4K]
	Bus: primary=00, secondary=06, subordinate=09, sec-latency=176
	Memory window 0: 20c00000-20fff000 (prefetchable)
	Memory window 1: 21000000-213ff000
	I/O window 0: 00004800-000048ff
	I/O window 1: 00004c00-00004cff
	16-bit legacy interface ports at 0001

0000:00:0a.2 FLASH memory: ENE Technology Inc CB710 Memory Card Reader Controller
	Subsystem: Asustek Computer, Inc.: Unknown device 173b
	Flags: medium devsel, IRQ 11
	I/O ports at 9800 [size=128]
	Capabilities: [a0] Power Management version 2

0000:00:0d.0 Ethernet controller: 3Com Corporation 3c940 10/100/1000Base-T [Marvell] (rev 12)
	Subsystem: Asustek Computer, Inc.: Unknown device 173c
	Flags: bus master, 66MHz, medium devsel, latency 32, IRQ 11
	Memory at e4000000 (32-bit, non-prefetchable) [size=16K]
	I/O ports at 9400 [size=256]
	Capabilities: [48] Power Management version 2
	Capabilities: [50] Vital Product Data

0000:01:00.0 VGA compatible controller: ATI Technologies Inc Radeon R250 Lf [Radeon Mobility 9000 M9] (rev 01) (prog-if 00 [VGA])
	Subsystem: Asustek Computer, Inc.: Unknown device 1732
	Flags: bus master, stepping, 66MHz, medium devsel, latency 64, IRQ 11
	Memory at f0000000 (32-bit, prefetchable) [size=128M]
	I/O ports at d800 [size=256]
	Memory at e7800000 (32-bit, non-prefetchable) [size=64K]
	Expansion ROM at effe0000 [disabled] [size=128K]
	Capabilities: [58] AGP version 2.0
	Capabilities: [50] Power Management version 2

Re: 2.6.12-rc5-mm1

[Arnd Bergmann]

On Sünnavend 28 Mai 2005 09:07, Christoph Hellwig wrote:
> On Fri, May 27, 2005 at 11:13:19PM +0200, Arnd Bergmann wrote:
> >
> > Chris, are there any existing binaries that rely on your implementations
> > of old_mmap, sys_fork, sys_vfork, sys_olduname or sys_ipc and need to
> > work with future kernels? Otherwise, you should probably drop these.
> > For sys_ipc, you would need to add the subcalls directly to the table,
> > like parisc does.
> 
> We should do that either way.  If people have existing binaries relying
> on broken thing before submitting ports for review it's their fault.
> 
Hmm, xtensa is now in -rc1, with the obsolete syscalls still in there,
so I guess this about the last chance to correct the ABI. Applying the
patch obviously breaks all sorts of user space binaries and probably
also requires the appropriate changes to be made to libc.

On the other hand, if a decision is made to keep the broken interface,
it should at least be a conscious one instead of an oversight.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---

 arch/xtensa/kernel/syscalls.c |  152 ------------------------------------------
 arch/xtensa/kernel/syscalls.h |   57 +++++++--------
 include/asm-xtensa/unistd.h   |   98 ---------------------------
 3 files changed, 30 insertions(+), 277 deletions(-)

Index: linus-2.6/arch/xtensa/kernel/syscalls.c
===================================================================
--- linus-2.6.orig/arch/xtensa/kernel/syscalls.c	2005-06-26 14:18:15.000000000 +0200
+++ linus-2.6/arch/xtensa/kernel/syscalls.c	2005-06-28 23:53:20.291408624 +0200
@@ -46,8 +46,6 @@
 
 extern void do_syscall_trace(void);
 typedef int (*syscall_t)(void *a0,...);
-extern int (*do_syscalls)(struct pt_regs *regs, syscall_t fun,
-				     int narg);
 extern syscall_t sys_call_table[];
 extern unsigned char sys_narg_table[];
 
@@ -72,10 +70,8 @@
 /*
  * Common code for old and new mmaps.
  */
-
-static inline long do_mmap2(unsigned long addr, unsigned long len,
-    			    unsigned long prot, unsigned long flags,
-			    unsigned long fd, unsigned long pgoff)
+long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
+	       unsigned long flags, unsigned long fd, unsigned long pgoff)
 {
 	int error = -EBADF;
 	struct file * file = NULL;
@@ -97,29 +93,6 @@
 	return error;
 }
 
-unsigned long old_mmap(unsigned long addr, size_t len, int prot,
-		       int flags, int fd, off_t offset)
-{
-	return do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
-}
-
-long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
-	       unsigned long flags, unsigned long fd, unsigned long pgoff)
-{
-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
-}
-
-int sys_fork(struct pt_regs *regs)
-{
-	return do_fork(SIGCHLD, regs->areg[1], regs, 0, NULL, NULL);
-}
-
-int sys_vfork(struct pt_regs *regs)
-{
-	return do_fork(CLONE_VFORK|CLONE_VM|SIGCHLD, regs->areg[1],
-		       regs, 0, NULL, NULL);
-}
-
 int sys_clone(struct pt_regs *regs)
 {
 	unsigned long clone_flags;
@@ -162,30 +135,6 @@
 	return -EFAULT;
 }
 
-int sys_olduname(struct oldold_utsname * name)
-{
-	int error;
-
-	if (!name)
-		return -EFAULT;
-	if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
-		return -EFAULT;
-
-	error = __copy_to_user(&name->sysname,&system_utsname.sysname,__OLD_UTS_LEN);
-	error -= __put_user(0,name->sysname+__OLD_UTS_LEN);
-	error -= __copy_to_user(&name->nodename,&system_utsname.nodename,__OLD_UTS_LEN);
-	error -= __put_user(0,name->nodename+__OLD_UTS_LEN);
-	error -= __copy_to_user(&name->release,&system_utsname.release,__OLD_UTS_LEN);
-	error -= __put_user(0,name->release+__OLD_UTS_LEN);
-	error -= __copy_to_user(&name->version,&system_utsname.version,__OLD_UTS_LEN);
-	error -= __put_user(0,name->version+__OLD_UTS_LEN);
-	error -= __copy_to_user(&name->machine,&system_utsname.machine,__OLD_UTS_LEN);
-	error -= __put_user(0,name->machine+__OLD_UTS_LEN);
-
-	return error ? -EFAULT : 0;
-}
-
-
 /*
  * Build the string table for the builtin "poor man's strace".
  */
@@ -319,100 +268,3 @@
 	regs->areg[2] = res;
 	do_syscall_trace();
 }
-
-/*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
- */
-
-int sys_ipc (uint call, int first, int second,
-			int third, void __user *ptr, long fifth)
-{
-	int version, ret;
-
-	version = call >> 16; /* hack for backward compatibility */
-	call &= 0xffff;
-	ret = -ENOSYS;
-
-	switch (call) {
-	case SEMOP:
-		ret = sys_semtimedop (first, (struct sembuf __user *)ptr,
-				     second, NULL);
-		break;
-
-	case SEMTIMEDOP:
-		ret = sys_semtimedop (first, (struct sembuf __user *)ptr,
-				      second, (const struct timespec *) fifth);
-		break;
-
-	case SEMGET:
-		ret = sys_semget (first, second, third);
-		break;
-
-	case SEMCTL: {
-		union semun fourth;
-
-		if (ptr && !get_user(fourth.__pad, (void *__user *) ptr))
-			ret = sys_semctl (first, second, third, fourth);
-		break;
-		}
-
-	case MSGSND:
-		ret = sys_msgsnd (first, (struct msgbuf __user*) ptr,
-				  second, third);
-		break;
-
-	case MSGRCV:
-		switch (version) {
-		case 0: {
-			struct ipc_kludge tmp;
-
-			if (ptr && !copy_from_user(&tmp,
-					   (struct ipc_kludge *) ptr,
-					   sizeof (tmp)))
-				ret = sys_msgrcv (first, tmp.msgp, second,
-						  tmp.msgtyp, third);
-			break;
-			}
-
-		default:
-			ret = sys_msgrcv (first, (struct msgbuf __user *) ptr,
-					  second, 0, third);
-			break;
-		}
-		break;
-
-	case MSGGET:
-		ret = sys_msgget ((key_t) first, second);
-		break;
-
-	case MSGCTL:
-		ret = sys_msgctl (first, second, (struct msqid_ds __user*) ptr);
-		break;
-
-	case SHMAT: {
-		ulong raddr;
-		ret = do_shmat (first, (char __user *) ptr, second, &raddr);
-
-		if (!ret)
-			ret = put_user (raddr, (ulong __user *) third);
-
-		break;
-		}
-
-	case SHMDT:
-		ret = sys_shmdt ((char __user *)ptr);
-		break;
-
-	case SHMGET:
-		ret = sys_shmget (first, second, third);
-		break;
-
-	case SHMCTL:
-		ret = sys_shmctl (first, second, (struct shmid_ds __user*) ptr);
-		break;
-	}
-	return ret;
-}
-
Index: linus-2.6/include/asm-xtensa/unistd.h
===================================================================
--- linus-2.6.orig/include/asm-xtensa/unistd.h	2005-06-26 14:18:16.000000000 +0200
+++ linus-2.6/include/asm-xtensa/unistd.h	2005-06-29 00:28:54.407973592 +0200
@@ -13,42 +13,31 @@
 
 #include <linux/linkage.h>
 
-//#define __NR_setup		  0 /* used only by init, to get system going */
 #define __NR_spill		  0
 #define __NR_exit		  1
-#define __NR_fork		  2
 #define __NR_read		  3
 #define __NR_write		  4
 #define __NR_open		  5
 #define __NR_close		  6
-#define __NR_waitpid		  7
 #define __NR_creat		  8
 #define __NR_link		  9
 #define __NR_unlink		 10
 #define __NR_execve		 11
 #define __NR_chdir		 12
-#define __NR_time		 13
 #define __NR_mknod		 14
 #define __NR_chmod		 15
 #define __NR_lchown		 16
 #define __NR_break		 17
-#define __NR_oldstat		 18
 #define __NR_lseek		 19
 #define __NR_getpid		 20
 #define __NR_mount		 21
-#define __NR_oldumount		 22
 #define __NR_setuid		 23
 #define __NR_getuid		 24
-#define __NR_stime		 25
 #define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
 #define __NR_utime		 30
 #define __NR_stty		 31
 #define __NR_gtty		 32
 #define __NR_access		 33
-#define __NR_nice		 34
 #define __NR_ftime		 35
 #define __NR_sync		 36
 #define __NR_kill		 37
@@ -66,24 +55,18 @@
 #define __NR_geteuid		 49
 #define __NR_getegid		 50
 #define __NR_acct		 51
-#define __NR_umount		 52
 #define __NR_lock		 53
 #define __NR_ioctl		 54
 #define __NR_fcntl		 55
-#define __NR_mpx		 56
 #define __NR_setpgid		 57
 #define __NR_ulimit		 58
-#define __NR_oldolduname	 59
 #define __NR_umask		 60
 #define __NR_chroot		 61
 #define __NR_ustat		 62
 #define __NR_dup2		 63
 #define __NR_getppid		 64
-#define __NR_getpgrp		 65
 #define __NR_setsid		 66
 #define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
 #define __NR_setreuid		 70
 #define __NR_setregid		 71
 #define __NR_sigsuspend		 72
@@ -98,13 +81,10 @@
 #define __NR_setgroups		 81
 #define __NR_select		 82
 #define __NR_symlink		 83
-#define __NR_oldlstat		 84
 #define __NR_readlink		 85
 #define __NR_uselib		 86
 #define __NR_swapon		 87
 #define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
 #define __NR_munmap		 91
 #define __NR_truncate		 92
 #define __NR_ftruncate		 93
@@ -116,22 +96,18 @@
 #define __NR_statfs		 99
 #define __NR_fstatfs		100
 #define __NR_ioperm		101
-#define __NR_socketcall		102
 #define __NR_syslog		103
 #define __NR_setitimer		104
 #define __NR_getitimer		105
 #define __NR_stat		106
 #define __NR_lstat		107
 #define __NR_fstat		108
-#define __NR_olduname		109
 #define __NR_iopl		110
 #define __NR_vhangup		111
 #define __NR_idle		112
-#define __NR_vm86		113
 #define __NR_wait4		114
 #define __NR_swapoff		115
 #define __NR_sysinfo		116
-#define __NR_ipc		117
 #define __NR_fsync		118
 #define __NR_sigreturn		119
 #define __NR_clone		120
@@ -140,18 +116,15 @@
 #define __NR_modify_ldt		123
 #define __NR_adjtimex		124
 #define __NR_mprotect		125
-#define __NR_sigprocmask	126
 #define __NR_create_module	127
 #define __NR_init_module	128
 #define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
 #define __NR_quotactl		131
 #define __NR_getpgid		132
 #define __NR_fchdir		133
 #define __NR_bdflush		134
 #define __NR_sysfs		135
 #define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
 #define __NR_setfsuid		138
 #define __NR_setfsgid		139
 #define __NR__llseek		140
@@ -222,8 +195,6 @@
 #define __NR_capset		205
 #define __NR_sigaltstack	206
 #define __NR_sendfile		207
-#define __NR_streams1		208	/* some people actually want it */
-#define __NR_streams2		209	/* some people actually want it */
 #define __NR_mmap2		210
 #define __NR_truncate64		211
 #define __NR_ftruncate64	212
@@ -234,7 +205,6 @@
 #define __NR_mincore		217
 #define __NR_madvise		218
 #define __NR_getdents64		219
-#define __NR_vfork		220
 
 /* Keep this last; should always equal the last valid call number. */
 #define __NR_Linux_syscalls     220
@@ -448,55 +418,7 @@
 
 
 #ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/syscalls.h>
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-
-#define __NR__exit __NR_exit
-
-static __inline__ _syscall0(int,pause)
-//static __inline__ _syscall1(int,setup,int,magic) FIXME
-static __inline__ _syscall0(int,sync)
-static __inline__ _syscall0(pid_t,setsid)
-static __inline__ _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static __inline__ _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static __inline__ _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static __inline__ _syscall1(int,dup,int,fd)
 static __inline__ _syscall3(int,execve,const char*,file,char**,argv,char**,envp)
-static __inline__ _syscall3(int,open,const char *,file,int,flag,int,mode)
-static __inline__ _syscall1(int,close,int,fd)
-static __inline__ _syscall1(int,_exit,int,exitcode)
-static __inline__ _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
-static __inline__ _syscall1(int,delete_module,const char *,name)
-
-struct stat;
-static __inline__ _syscall2(int,fstat,int,fd,struct stat *,buf)
-static __inline__ _syscall0(pid_t,getpid)
-static __inline__ _syscall2(int,kill,int,pid,int,sig)
-static __inline__ _syscall2(int,stat,const char *, path,struct stat *,buf)
-static __inline__ _syscall1(int,unlink,char *,pathname)
-
-
-
-extern pid_t waitpid(int, int*, int );
-static __inline__ pid_t wait(int * wait_stat)
-{
-	return waitpid(-1,wait_stat,0);
-}
 #endif
 
 /*
@@ -508,30 +430,10 @@
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
 #ifdef __KERNEL__
-#define __ARCH_WANT_IPC_PARSE_VERSION
-#define __ARCH_WANT_OLD_READDIR
-#define __ARCH_WANT_OLD_STAT
 #define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_ALARM
-#define __ARCH_WANT_SYS_GETHOSTNAME
-#define __ARCH_WANT_SYS_PAUSE
-#define __ARCH_WANT_SYS_SGETMASK
-#define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
 #define __ARCH_WANT_SYS_UTIME
-#define __ARCH_WANT_SYS_WAITPID
-#define __ARCH_WANT_SYS_SOCKETCALL
-#define __ARCH_WANT_SYS_FADVISE64
-#define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_LLSEEK
-#define __ARCH_WANT_SYS_NICE
-#define __ARCH_WANT_SYS_OLD_GETRLIMIT
-#define __ARCH_WANT_SYS_OLDUMOUNT
-#define __ARCH_WANT_SYS_SIGPENDING
-#define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #endif
 
-
-
 #endif	/* _XTENSA_UNISTD_H */
Index: linus-2.6/arch/xtensa/kernel/syscalls.h
===================================================================
--- linus-2.6.orig/arch/xtensa/kernel/syscalls.h	2005-06-28 23:53:14.458295392 +0200
+++ linus-2.6/arch/xtensa/kernel/syscalls.h	2005-06-29 00:11:34.759024256 +0200
@@ -25,20 +25,19 @@
  */
 
 SYSCALL(0, 0)		                /* 00 */
-
 SYSCALL(sys_exit, 1)
-SYSCALL(sys_fork, 0)
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_read, 3)
 SYSCALL(sys_write, 3)
 SYSCALL(sys_open, 3)			/* 05 */
 SYSCALL(sys_close, 1)
-SYSCALL(sys_waitpid, 3)
+SYSCALL(sys_ni_syscall, 3)
 SYSCALL(sys_creat, 2)
 SYSCALL(sys_link, 2)
 SYSCALL(sys_unlink, 1)			/* 10 */
 SYSCALL(sys_execve, 0)
 SYSCALL(sys_chdir, 1)
-SYSCALL(sys_time, 1)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_mknod, 3)
 SYSCALL(sys_chmod, 2)			/* 15 */
 SYSCALL(sys_lchown, 3)
@@ -47,19 +46,19 @@
 SYSCALL(sys_lseek, 3)
 SYSCALL(sys_getpid, 0)			/* 20 */
 SYSCALL(sys_mount, 5)
-SYSCALL(sys_oldumount, 1)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_setuid, 1)
 SYSCALL(sys_getuid, 0)
-SYSCALL(sys_stime, 1)			/* 25 */
+SYSCALL(sys_ni_syscall, 1)		/* 25 */
 SYSCALL(sys_ptrace, 4)
-SYSCALL(sys_alarm, 1)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_fstat, 2)
-SYSCALL(sys_pause, 0)
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_utime, 2)			/* 30 */
 SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_access, 2)
-SYSCALL(sys_nice, 1)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_ni_syscall, 0)		/* 35 */
 SYSCALL(sys_sync, 0)
 SYSCALL(sys_kill, 2)
@@ -73,7 +72,7 @@
 SYSCALL(sys_brk, 1)			/* 45 */
 SYSCALL(sys_setgid, 1)
 SYSCALL(sys_getgid, 0)
-SYSCALL(sys_ni_syscall, 0)		/* was signal(2) */
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_geteuid, 0)
 SYSCALL(sys_getegid, 0)			/* 50 */
 SYSCALL(sys_acct, 1)
@@ -84,21 +83,21 @@
 SYSCALL(sys_ni_syscall, 2)
 SYSCALL(sys_setpgid, 2)
 SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_olduname, 1)
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_umask, 1)			/* 60 */
 SYSCALL(sys_chroot, 1)
 SYSCALL(sys_ustat, 2)
 SYSCALL(sys_dup2, 2)
 SYSCALL(sys_getppid, 0)
-SYSCALL(sys_getpgrp, 0)			/* 65 */
+SYSCALL(sys_ni_syscall, 0)		/* 65 */
 SYSCALL(sys_setsid, 0)
 SYSCALL(sys_sigaction, 3)
-SYSCALL(sys_sgetmask, 0)
-SYSCALL(sys_ssetmask, 1)
+SYSCALL(sys_ni_syscall, 0)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_setreuid, 2)		/* 70 */
 SYSCALL(sys_setregid, 2)
 SYSCALL(sys_sigsuspend, 0)
-SYSCALL(sys_sigpending, 1)
+SYSCALL(sys_ni_syscall, 1)
 SYSCALL(sys_sethostname, 2)
 SYSCALL(sys_setrlimit, 2)		/* 75 */
 SYSCALL(sys_getrlimit, 2)
@@ -107,15 +106,15 @@
 SYSCALL(sys_settimeofday, 2)
 SYSCALL(sys_getgroups, 2)		/* 80 */
 SYSCALL(sys_setgroups, 2)
-SYSCALL(sys_ni_syscall, 0)		 /* old_select */
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_symlink, 2)
 SYSCALL(sys_lstat, 2)
 SYSCALL(sys_readlink, 3)		/* 85 */
 SYSCALL(sys_uselib, 1)
 SYSCALL(sys_swapon, 2)
 SYSCALL(sys_reboot, 3)
-SYSCALL(old_readdir, 3)
-SYSCALL(old_mmap, 6)			/* 90 */
+SYSCALL(sys_ni_syscall, 3)
+SYSCALL(sys_ni_syscall, 6)		/* 90 */
 SYSCALL(sys_munmap, 2)
 SYSCALL(sys_truncate, 2)
 SYSCALL(sys_ftruncate, 2)
@@ -127,7 +126,7 @@
 SYSCALL(sys_statfs, 2)
 SYSCALL(sys_fstatfs, 2)			/* 100 */
 SYSCALL(sys_ni_syscall, 3)
-SYSCALL(sys_socketcall, 2)
+SYSCALL(sys_ni_syscall, 2)
 SYSCALL(sys_syslog, 3)
 SYSCALL(sys_setitimer, 3)
 SYSCALL(sys_getitimer, 2)		/* 105 */
@@ -137,32 +136,32 @@
 SYSCALL(sys_uname, 1)
 SYSCALL(sys_ni_syscall, 0)		/* 110 */
 SYSCALL(sys_vhangup, 0)
-SYSCALL(sys_ni_syscall, 0)		/* was sys_idle() */
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_wait4, 4)
 SYSCALL(sys_swapoff, 1)			/* 115 */
 SYSCALL(sys_sysinfo, 1)
-SYSCALL(sys_ipc, 5)   			/* 6 really, but glibc uses only 5) */
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_fsync, 1)
 SYSCALL(sys_sigreturn, 0)
 SYSCALL(sys_clone, 0)			/* 120 */
 SYSCALL(sys_setdomainname, 2)
 SYSCALL(sys_newuname, 1)
-SYSCALL(sys_ni_syscall, 0) 		/* sys_modify_ldt */
+SYSCALL(sys_ni_syscall, 0) 
 SYSCALL(sys_adjtimex, 1)
 SYSCALL(sys_mprotect, 3)		/* 125 */
-SYSCALL(sys_sigprocmask, 3)
-SYSCALL(sys_ni_syscall, 2)		/* old sys_create_module */
+SYSCALL(sys_ni_syscall, 3)
+SYSCALL(sys_ni_syscall, 2)
 SYSCALL(sys_init_module, 2)
 SYSCALL(sys_delete_module, 1)
-SYSCALL(sys_ni_syscall, 1)		/* old sys_get_kernel_sysm */	/* 130 */
+SYSCALL(sys_ni_syscall, 1)		/* 130 */
 SYSCALL(sys_quotactl, 0)
 SYSCALL(sys_getpgid, 1)
 SYSCALL(sys_fchdir, 1)
 SYSCALL(sys_bdflush, 2)
 SYSCALL(sys_sysfs, 3)			/* 135 */
 SYSCALL(sys_personality, 1)
-SYSCALL(sys_ni_syscall, 0)		/* for afs_syscall */
+SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_setfsuid, 1)
 SYSCALL(sys_setfsgid, 1)
 SYSCALL(sys_llseek, 5)			/* 140 */
@@ -212,7 +211,7 @@
 SYSCALL(sys_socketpair, 4)
 SYSCALL(sys_setresuid, 3)		/* 185 */
 SYSCALL(sys_getresuid, 3)
-SYSCALL(sys_ni_syscall, 5)		/* old sys_query_module */
+SYSCALL(sys_ni_syscall, 5)
 SYSCALL(sys_poll, 3)
 SYSCALL(sys_nfsservctl, 3)
 SYSCALL(sys_setresgid, 3)		/* 190 */
@@ -235,7 +234,7 @@
 SYSCALL(sys_sendfile, 4)
 SYSCALL(sys_ni_syscall, 0)
 SYSCALL(sys_ni_syscall, 0)
-SYSCALL(sys_mmap2, 6)			/* 210 */
+SYSCALL(sys_mmap, 6)			/* 210 */
 SYSCALL(sys_truncate64, 2)
 SYSCALL(sys_ftruncate64, 2)
 SYSCALL(sys_stat64, 2)
@@ -245,4 +244,4 @@
 SYSCALL(sys_mincore, 3)
 SYSCALL(sys_madvise, 3)
 SYSCALL(sys_getdents64, 3)
-SYSCALL(sys_vfork, 0)			/* 220 */
+SYSCALL(sys_ni_syscall, 0)		/* 220 */