2005-04-30 06:20:22

by Andrew Morton

[permalink] [raw]
Subject: 2.6.12-rc3-mm1


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

- There's still a bug in the new timer code. If you think you hit it,
please revert

timers-fixes-improvements-fix.patch then
timers-fixes-improvements-smp_processor_id-fix.patch then
timers-fixes-improvements.patch

or, better, fix the bug.

- If you use mpt-fusion, beware that the CONFIG_* names got changed - if you
blindly do `make oldconfig' you won't have any disks.

- ia64 crashes when doing a PM poweroff. It's triggered by
properly-stop-devices-before-poweroff.patch but appears to be an ia64 bug.

- Lots of bk trees were dropped and lots of git trees and patch serieses
were picked up. I think all the subsystem trees are here, but the bk ones
are starting to rot. As far as I can tell, no subsystem maintainers are
updating their bk trees (apart from acpi).

- We're still miles away from 2.6.12. Lots of patches here, plus my
collection of bugs-post-2.6.11 is vast. I'll start working through them
again after 2.6.12-rc4 is available to testers.




Changes since 2.6.12-rc2-mm3:

+linus.patch

Latest Linus tree

-re-export-cancel_rearming_delayed_workqueue.patch
-fix-acl-oops.patch
-fix-crash-in-entrys-restore_all.patch
-fix-get_compat_sigevent.patch
-fix-bug-4395-modprobe-bttv-freezes-the-computer.patch
-selinux-fix-bug-in-netlink-message-type-detection.patch
-r128_statec-break-missing-in-switch-statement.patch
-bk-acpi-alpha-build-fix.patch
-acpi-toshiba-failure-handling.patch
-acpi-video-pointer-size-fix.patch
-acpi-fix-reloading-gdt-on-acpi-s3-wakeup.patch
-add-suspend-method-to-cpufreq-core.patch
-add-suspend-method-to-cpufreq-core-warning-fix.patch
-bk-driver-core-usb-klist_node_attached-fix.patch
-i2c-adaptor-for-coldfire-5282-cpu.patch
-i2c-adaptor-for-coldfire-5282-cpu-fix.patch
-ia64-fix-fls.patch
-gregkh-pci-kconfig-fix.patch
-pci_module_init-pci_register_driver.patch
-acpi-hotplug-convert-acpiphp-to-use-generic-resource-code.patch
-acpi-hotplug-clean-up-notify-handlers-on-acpiphp-unload.patch
-acpi-hotplug-fix-slot-power-down-problem-with-acpiphp.patch
-acpi-hotplug-acpi-based-root-bridge-hot-add.patch
-acpi-hotplug-decouple-slot-power-state-changes-from-physical-hotplug.patch
-pm-support-for-zd1201.patch
-usb-turn-a-user-mode-driver-error-into-a-hard-error.patch
-usb-storage-debugc-missing-include.patch
-freepgt-free_pgtables-use-vma-list.patch
-freepgt-remove-mm_vm_sizemm.patch
-freepgt-hugetlb_free_pgd_range.patch
-freepgt-hugetlb_free_pgd_range-fix-aio-panic-fix.patch
-freepgt-remove-arch-pgd_addr_end.patch
-freepgt-mpnt-to-vma-cleanup.patch
-freepgt-hugetlb-area-is-clean.patch
-freepgt2-free_pgtables-from-first_user_address.patch
-freepgt2-sys_mincore-ignore-first_user_pgd_nr.patch
-freepgt2-arm-first_user_address-page_size.patch
-freepgt2-arm26-first_user_address-page_size.patch
-freepgt2-arch-first_user_address-0.patch
-freepgt2-remove-first_user_address-hack.patch
-filemap_getpage-can-block-when-map_nonblock-specified.patch
-oom-killer-disable-for-iscsi-lvm2-multipath-userland-critical-sections.patch
-vmscan-pageout-remove-unneeded-test.patch
-end_buffer_write_sync-avoid-pointless-assignments.patch
-meminfo-add-cached-underflow-check.patch
-eni155p-error-handling-fix.patch
-fix-linux-atalkh-header.patch
-dont-call-kmem_cache_create-with-a-spinlock-held.patch
-fix-dst_destroy-race.patch
-irda_device-oops-fix.patch
-net-ieee80211-ieee80211_txc-swapped-memset-arguments.patch
-selinux-add-support-for-netlink_kobject_uevent.patch
-ppc32-fix-bogosity-in-process-freezing-code.patch
-ppc32-ppc4xx_pic-add-acknowledge-when-enabling-level-sensitive-irq.patch
-ppc32-improve-timebase-sync-for-smp.patch
-ppc32-oops-on-kernel-altivec-assist-exceptions.patch
-ppc32-fix-single-stepping-of-emulated-instructions.patch
-ppc32-fix-cpufreq-problems.patch
-ppc32-fix-agp-and-sleep-again.patch
-ppc32-fix-pte_update-for-64-bit-ptes.patch
-ppc32-make-usage-of-config_pte_64bit-config_phys_64bit.patch
-ppc32-allow-adjust-of-pfn-offset-in-pte.patch
-ppc32-support-36-bit-physical-addressing-on-e500.patch
-ppc32-fix-mpc8xx-watchdog.patch
-ppc32-fix-a-problem-with-ntp-on-chrpgemini.patch
-ppc32-fix-building-32bit-kernel-for-64bit-machines.patch
-ppc32-make-the-powerstack-ii-pro4000-boot-again.patch
-pmac-sound-support-for-latest-laptops.patch
-pmac-improve-sleep-code-of-tumbler-driver.patch
-ppc64-fix-semantics-of-__ioremap.patch
-ppc64-fix-export-of-wrong-symbol.patch
-ppc64-kconfig-memory-models.patch
-ppc64-improve-mapping-of-vdso.patch
-ppc64-detect-altivec-via-firmware-on-unknown-cpus.patch
-ppc64-remove-bogus-f50-hack-in-promc.patch
-ppc64-remove-fno-omit-frame-pointer.patch
-ppc64-no-prefetch-for-null-pointers.patch
-mips-remove-obsolete-vr41xx-rtc-function.patch
-mips-update-vr41xx-cpu-pci-bridge.patch
-mips-remove-include-linux-audith-two.patch
-irq-and-pci_ids-patch-for-intel-esb2.patch
-piix-ide-pata-patch-for-intel-esb2.patch
-intel8x0-ac97-audio-patch-for-intel-esb2.patch
-ata_piix-ide-mode-sata-patch-for-intel-esb2.patch
-ahci-ahci-mode-sata-patch-for-intel-esb2.patch
-i2c-i801-i2c-patch-for-intel-esb2.patch
-i386-use-loaddebug-macro-consistently.patch
-i386-vdso-add-pt_note-segment.patch
-x86-64-i386-vdso-add-pt_note-segment.patch
-x86-64-i386-revert-cpuinfo-siblings-behaviour-back-to-2610.patch
-x86-64-fix-bug.patch
-x86_64-disable-interrupts-during-smp-bogomips-checking.patch
-x86_64-genapic-update.patch
-x86_64-show_stack-touch_nmi_watchdog.patch
-x86_64-use-a-vma-for-the-32bit-vsyscall.patch
-x86_64-make-irda-devices-are-not-really-isa-devices-not.patch
-x86_64-from-i386-originally-from-linus.patch
-x86_64-some-fixes-for-single-step-handling.patch
-x86_64-handle-programs-that-set-tf-in-user-space-using.patch
-x86_64-use-a-common-function-to-find-code-segment-bases.patch
-x86_64-use-a-common-function-to-find-code-segment-bases-fix.patch
-x86_64-dump-stack-and-prevent-recursion-on-early-fault.patch
-x86_64-fix-interaction-of-single-stepping-with-debuggers.patch
-x86_64-minor-microoptimization-in-syscall-entry-slow-path.patch
-x86_64-call-do_notify_resume-unconditionally-in-entrys.patch
-x86_64-regularize-exception-stack-handling.patch
-x86_64-fix-a-small-missing-schedule-race.patch
-x86_64-remove-unused-macro-in-preempt-support.patch
-x86_64-support-constantly-ticking-tscs.patch
-x86_64-make-kernel-math-errors-a-die-now.patch
-x86_64-dont-assume-future-amd-cpus-have-k8-compatible.patch
-x86_64-correct-wrong-comment-in-localh.patch
-x86_64-use-the-extended-rip-msr-for-machine-check.patch
-x86_64-remove-excessive-stack-allocation-in-mce-code.patch
-x86_64-always-use-cpuid-80000008-to-figure-out-mtrr.patch
-x86_64-always-use-cpuid-80000008-to-figure-out-mtrr-fix.patch
-x86_64-port-over-e820-gap-detection-from-i386.patch
-x86_64-use-the-e820-hole-to-map-the-iommu-agp-aperture.patch
-x86_64-keep-only-a-single-debug-notifier-chain.patch
-x86_64-remove-duplicated-syscall-entry.patch
-x86_64-adds-support-for-intel-dual-core-detection-and-displaying.patch
-x86_64-final-support-for-amd-dual-core.patch
-x86_64-final-support-for-amd-dual-core-fix.patch
-x86_64-final-support-for-amd-dual-core-fix-2.patch
-x86_64-final-support-for-amd-dual-core-fix-fix.patch
-x86_64-final-support-for-amd-dual-core-fix-fix-fix.patch
-x86_64-rewrite-exception-stack-backtracing.patch
-x86_64-add-acpi_skip_timer_override-option.patch
-x86_64-rename-the-extended-cpuid-level-field.patch
-x86_64-switch-smp-bootup-over-to-new-cpu-hotplug-state.patch
-x86_64-switch-smp-bootup-over-to-new-cpu-hotplug-state-fix.patch
-h8300-header-update.patch
-pm_message_t-more-fixes-in-common-and-i386.patch
-fix-u32-vs-pm_message_t-in-drivers-char.patch
-u32-vs-pm_message_t-fixes-for-drivers-net.patch
-fix-u32-vs-pm_message_t-in-pcmcia.patch
-fix-u32-vs-pm_message_t-in-drivers-media.patch
-fix-u32-vs-pm_message_t-in-drivers-message.patch
-fix-u32-vs-pm_message_t-in-drivers-mmcmtdscsi.patch
-fix-pm_message_t-vs-u32-in-alsa.patch
-fix-u32-vs-pm_message_t-in-x86-64.patch
-fix-u32-vs-pm_message_t-in-drivers-macintosh.patch
-fix-u32-vs-pm_message_t-in-pci-pcie.patch
-u32-vs-pm_message_t-in-ppc-and-radeon.patch
-power-videotxt-update-documentation-with-more-systems.patch
-fix-u32-vs-pm_message_t-in-drivers.patch
-fix-u32-vs-pm_message_t-in-driver-video.patch
-fix-u32-vs-pm_message_t-in-rest-of-the-tree.patch
-swsusp-smp-fix.patch
-uml-fix-compilation-for-__choose_mode-addition.patch
-possible-use-after-free-of-bio.patch
-async-io-using-rt-signals.patch
-kernel-paramc-dont-use-max-when-num-is-null-in.patch
-fix-module_param_string-calls.patch
-use-cheaper-elv_queue_empty-when-unplug-a-device.patch
-fixup-newly-added-jsm-driver.patch
-ext2-corruption-regression-between-269-and-2610.patch
-quota-fix-possible-oops-on-quotaoff.patch
-quota-possible-bug-in-quota-format-v2-support.patch
-kill-ifndef-have_arch_get_signal_to_deliver-in-signalc.patch
-officially-deprecate-register_ioctl32_conversion.patch
-undo-do_readv_writev-behavior-change.patch
-kprobes-incorrect-handling-of-probes-on-ret-lret-instruction.patch
-show-thread_info-flags-in-proc-pid-status.patch
-direct-io-async-short-read-fix.patch
-fix-comment-in-listh-that-refers-to-nonexistent-api.patch
-pnpbios-eliminate-bad-section-references.patch
-hd-eliminate-bad-section-references.patch
-efi-eliminate-bad-section-references.patch
-add-big-endian-variants-of-ioread-iowrite.patch
-opl3sa2-module_parm_desc.patch
-update-maintainer-for-dev-random.patch
-add-dontdiff-file.patch
-as-limit-queue-depth-fix.patch
-kprobes-multiple-probes-feature-at-given-address.patch
-credits-update.patch
-pci-enumeration-on-ixp2000-overflow-in-kernel-resourcec.patch
-cpuset-remove-function-attribute-const.patch
-let-sound_ad1889-depend-on-pci.patch
-maintainers-remove-obsolete-acp-mwave-modem-entry.patch
-ipoib-set-skb-macraw-on-receive.patch
-ipoib-fix-static-rate-calculation.patch
-ipoib-convert-to-debugfs.patch
-ipoib-document-conversion-to.patch
-ib-keep-mad-work-completion-valid.patch
-ib-remove-unneeded-includes.patch
-ib-fix-fmr-pool-crash.patch
-ib-trivial-fmr-printk-cleanup.patch
-ib-fix-user-mad-registrations-with-class-0.patch
-ib-remove-incorrect-comments.patch
-ib-mthca-map-mpt-mtt-context-in-mem-free-mode.patch
-ib-mthca-fill-in-more-device-query-fields.patch
-ib-mthca-fix-calculation-of-rdb-shift.patch
-ib-mthca-fix-posting-sends-with-immediate-data.patch
-ib-mthca-allow-unaligned-memory-regions.patch
-ib-mthca-allocate-correct-number-of-doorbell-pages.patch
-ib-mthca-clean-up-mthca_dereg_mr.patch
-ib-mthca-fix-mr-allocation-error-path.patch
-ib-mthca-release-mutex-on-doorbell-alloc-error-path.patch
-ib-mthca-print-assigned-irq-when-interrupt-test-fails.patch
-ib-mthca-only-free-doorbell-records-in-mem-free-mode.patch
-ib-mthca-fix-format-of-cq-number-for-cq-events.patch
-ib-mthca-implement-rdma-atomic-operations-for-mem-free-mode.patch
-ib-mthca-fix-mtt-allocation-in-mem-free-mode.patch
-ib-mthca-fill-in-opcode-field-for-send-completions.patch
-ib-mthca-allow-address-handle-creation-in-interrupt-context.patch
-ib-mthca-encapsulate-mtt-buddy-allocator.patch
-ib-mthca-add-sync_tpt-firmware-command.patch
-ib-mthca-add-mthca_write64_raw-for-writing-to-mtt-table-directly.patch
-ib-mthca-add-mthca_table_find-function.patch
-ib-mthca-split-mr-key-munging-routines.patch
-ib-mthca-add-fast-memory-region-implementation.patch
-ib-mthca-tweaks-to-mthca_cmdc.patch
-ib-mthca-encapsulate-mem-free-check-into-mthca_is_memfree.patch
-ib-mthca-map-context-for-rdma-responder-in-mem-free-mode.patch
-ib-mthca-update-receive-queue-initialization-for-new-hcas.patch
-ib-mthca-add-support-for-new-mt25204-hca.patch
-ib-mthca-add-support-for-new-mt25204-hca-fix.patch
-jbd-dirty-buffer-leak-fix.patch
-nfsd-clear-signals-before-exiting-the-nfsd-thread.patch
-nfsd4-callback-create-rpc-client-returns.patch
-nfsd4-fix-struct-file-leak.patch
-fbdev-maintainers-update.patch
-md-close-a-small-race-in-md-thread-deregistration.patch
-md-remove-a-number-of-misleading-calls-to-md_bug.patch
-tpm-fix-gcc-printk-warnings.patch
-net-atm-resourcesc-remove-__free_atm_dev.patch

Merged

+ultrastor-build-fix.patch

scsi driver compile fix

-bk-agpgart.patch

Dropped

+agp-AGP-01-printk-levels.patch

davej's agp tree

-bk-alsa.patch

Dropped

+intel8x0-fix-for-intel-ac97-audio-driver.patch
+interwave-needs-isa-pnp.patch

Audio driver fixes

-bk-cifs.patch

Dropped

-bk-cpufreq.patch

Dropped

+cpufreq-CPUFREQ-01-powernow-k7-No-FSB-KHz.patch
+cpufreq-CPUFREQ-02-core-reduce-warning-msgs.patch
+cpufreq-CPUFREQ-03-speedstep-centrino-P4M-HT-support.patch
+cpufreq-CPUFREQ-04-ondemand-cleanups.patch
+cpufreq-CPUFREQ-05-speedstep-smi-p4m.patch
+cpufreq-CPUFREQ-06-default-governor-warning.patch
+cpufreq-CPUFREQ-07-AMD-Elan-driver.patch

cpufreq tree

-gregkh-driver.patch

Dropped

+gregkh-01-driver-gregkh-driver-001_driver-name-const-01.patch
+gregkh-01-driver-gregkh-driver-002_driver-name-const-02.patch
+gregkh-01-driver-gregkh-driver-003_driver-name-const-03.patch
+gregkh-01-driver-gregkh-driver-004_driver-name-const-04.patch
+gregkh-01-driver-gregkh-driver-005_driver-name-const-05.patch
+gregkh-01-driver-gregkh-driver-006_class-01-core.patch
+gregkh-01-driver-gregkh-driver-007_class-02-tty.patch
+gregkh-01-driver-gregkh-driver-008_class-03-input.patch
+gregkh-01-driver-gregkh-driver-009_class-04-usb.patch
+gregkh-01-driver-gregkh-driver-010_class-05-sound.patch
+gregkh-01-driver-gregkh-driver-011_class-06-block.patch
+gregkh-01-driver-gregkh-driver-012_class-07-char.patch
+gregkh-01-driver-gregkh-driver-013_class-08-ieee1394.patch
+gregkh-01-driver-gregkh-driver-014_class-09-scsi.patch
+gregkh-01-driver-gregkh-driver-015_class-10-arch.patch
+gregkh-01-driver-gregkh-driver-016_class-11-drivers.patch
+gregkh-01-driver-gregkh-driver-017_class-12-the_rest.patch
+gregkh-01-driver-gregkh-driver-018_class-13-kerneldoc.patch
+gregkh-01-driver-gregkh-driver-019_class-14-no_more_class_simple.patch
+gregkh-01-driver-gregkh-driver-020_class-15-typo-01.patch
+gregkh-01-driver-gregkh-driver-021_class-16-typo-02.patch
+gregkh-01-driver-gregkh-driver-022_class-17-attribute.patch
+gregkh-01-driver-gregkh-driver-023_klist-01.patch
+gregkh-01-driver-gregkh-driver-024_klist-02.patch
+gregkh-01-driver-gregkh-driver-025_klist-03.patch
+gregkh-01-driver-gregkh-driver-026_klist-04.patch
+gregkh-01-driver-gregkh-driver-027_klist-05.patch
+gregkh-01-driver-gregkh-driver-028_klist-06.patch
+gregkh-01-driver-gregkh-driver-029_klist-07.patch
+gregkh-01-driver-gregkh-driver-030_klist-08.patch
+gregkh-01-driver-gregkh-driver-031_klist-09.patch
+gregkh-01-driver-gregkh-driver-032_klist-10.patch
+gregkh-01-driver-gregkh-driver-033_klist-11.patch
+gregkh-01-driver-gregkh-driver-034_klist-12.patch
+gregkh-01-driver-gregkh-driver-035_klist-13.patch
+gregkh-01-driver-gregkh-driver-036_klist-14.patch
+gregkh-01-driver-gregkh-driver-037_klist-15.patch
+gregkh-01-driver-gregkh-driver-038_klist-16.patch
+gregkh-01-driver-gregkh-driver-039_klist-17.patch
+gregkh-01-driver-gregkh-driver-040_klist-18.patch
+gregkh-01-driver-gregkh-driver-041_klist-scsi-01.patch
+gregkh-01-driver-gregkh-driver-042_klist-scsi-02.patch
+gregkh-01-driver-gregkh-driver-043_klist-20.patch
+gregkh-01-driver-gregkh-driver-044_klist-21.patch
+gregkh-01-driver-gregkh-driver-045_klist-22.patch
+gregkh-01-driver-gregkh-driver-046_klist-23.patch
+gregkh-01-driver-gregkh-driver-047_klist-ieee1394.patch
+gregkh-01-driver-gregkh-driver-048_klist-pcie.patch
+gregkh-01-driver-gregkh-driver-049_klist-24.patch
+gregkh-01-driver-gregkh-driver-050_klist-25.patch
+gregkh-01-driver-gregkh-driver-051_klist-26.patch
+gregkh-01-driver-gregkh-driver-052_klist-usb_node_attached_fix.patch

Greg's driver tree

-gregkh-i2c.patch

Dropped

+gregkh-02-i2c-gregkh-i2c-001_i2c-address_range_removal.patch
+gregkh-02-i2c-gregkh-i2c-002_i2c-address_merge_video.patch

Greg's i2c tree

-bk-ia64.patch

Dropped

+git-ia64.patch

Tony Luck's ia64 tree

+git-audit.patch

Davie Woodhouse'e audit subsystem tree

+netlink-audit-warning-fix.patch

Fix a warning in it

-bk-jfs.patch

Dropped

+toshiba-driver-cleanup.patch

Toshiba legacy driver cleanup

+i8k-pass-through-lindent.patch
+i8k-use-standard-dmi-interface.patch
+i8k-use-standard-dmi-interface-fix.patch
+i8k-convert-to-seqfile.patch
+i8k-initialization-code-cleanup-formatting.patch
+i8k-add-new-bios-signatures.patch

i8k updates

+jfs-reduce-number-of-synchronous-transactions.patch
+jfs-simplify-creation-of-new-iag.patch
+jfs-changes-for-larger-page-size.patch
+jfs-support-page-sizes-greater-than-4k.patch
+jfs-write-journal-sync-points-more-often.patch
+jfs-dont-allocate-extents-that-overlap-existing-extents.patch

Dave Kleikamp's JFS tree

-bk-kconfig.patch

Dropped

+preserve-arch-and-cross_compile-in-the-build-directory-generated-makefile.patch

kbuild fix

-remove-inter-module-mtd.patch

Dropped, was wrong.

+natsemi-multicast-initialisation-fix.patch
+r8169-new-pci-id.patch

Net driver fixes

-gregkh-pci.patch

Dropped

+gregkh-03-pci-gregkh-pci-001_pci-is_enabled_fix.patch
+gregkh-03-pci-gregkh-pci-002_pci-pci_get_slot-docs.patch
+gregkh-03-pci-gregkh-pci-003_pci-stale_pm_docs.patch
+gregkh-03-pci-gregkh-pci-004_pci-sparse_cleanup.patch
+gregkh-03-pci-gregkh-pci-005_pci-sysfs-pciconfig-readwrite.patch
+gregkh-03-pci-gregkh-pci-006_pci_shutdown.patch
+gregkh-03-pci-gregkh-pci-007_pci-ibmphp-bugfix.patch
+gregkh-03-pci-gregkh-pci-008_pci-hance_quirk.patch
+gregkh-03-pci-gregkh-pci-009_pci-pci-transparent-bridge-handling-improvements-pci-core.patch
+gregkh-03-pci-gregkh-pci-010_pci-pirq_table_addr-out-of-range.patch
+gregkh-03-pci-gregkh-pci-011_pci-get_device-01.patch
+gregkh-03-pci-gregkh-pci-012_pci-get_device-02.patch
+gregkh-03-pci-gregkh-pci-013_pci-acpiphp-01.patch
+gregkh-03-pci-gregkh-pci-014_pci-acpiphp-02.patch
+gregkh-03-pci-gregkh-pci-015_pci-acpiphp-03.patch
+gregkh-03-pci-gregkh-pci-016_pci-acpiphp-04.patch
+gregkh-03-pci-gregkh-pci-017_pci-acpiphp-05.patch

Greg's PCI tree

+acpi-based-i-o-apic-hot-plug-add-interfaces.patch
+acpi-based-i-o-apic-hot-plug-ia64-support.patch
+acpi-based-i-o-apic-hot-plug-acpiphp-support.patch

I/O APIC hotplug support

-bk-scsi.patch

Dropped

+git-scsi-misc.patch

James's scsi tree

+mptfusion-fix-panic-loading-driver-statically-com.patch

Fix non-modular MPT-Fusion driver

+git-scsi-rc-fixes.patch

James's -rc fixes scsi tree

-gregkh-usb.patch

Dropped

+gregkh-04-USB-gregkh-usb-015_usb-storage_build_fix.patch
+gregkh-04-USB-gregkh-usb-018_usb-airprime.patch
+gregkh-04-USB-gregkh-usb-019_usb-airprime-num_devices.patch
+gregkh-04-USB-gregkh-usb-020_usb-g_file_storage_min.patch
+gregkh-04-USB-gregkh-usb-021_usb-g_file_storage_stall.patch
+gregkh-04-USB-gregkh-usb-022_usb-ehci_power_fixes.patch
+gregkh-04-USB-gregkh-usb-023_usb-omap_udc_update.patch
+gregkh-04-USB-gregkh-usb-024_usb-isp116x-hcd-add.patch
+gregkh-04-USB-gregkh-usb-025_usb-isp116x-hcd-fix.patch
+gregkh-04-USB-gregkh-usb-026_usb-turn-a-user-mode-driver-error-into-a-hard-error.patch
+gregkh-04-USB-gregkh-usb-027_usb-uhci-01.patch
+gregkh-04-USB-gregkh-usb-028_usb-uhci-02.patch
+gregkh-04-USB-gregkh-usb-029_usb-uhci-03.patch
+gregkh-04-USB-gregkh-usb-030_usb-uhci-04.patch
+gregkh-04-USB-gregkh-usb-031_usb-uhci-05.patch
+gregkh-04-USB-gregkh-usb-032_usb-uhci-06.patch
+gregkh-04-USB-gregkh-usb-033_usb-uhci-07.patch
+gregkh-04-USB-gregkh-usb-034_usb-root_hub_irq.patch
+gregkh-04-USB-gregkh-usb-035_usb-cdc_acm.patch
+gregkh-04-USB-gregkh-usb-036_usb-usbtest.patch
+gregkh-04-USB-gregkh-usb-037_usb-ohci_reboot_notifier.patch
+gregkh-04-USB-gregkh-usb-038_usb_serial_status.patch
+gregkh-04-USB-gregkh-usb-039_usb-zd1201_pm.patch
+gregkh-04-USB-gregkh-usb-040_usb-remove_hub_set_power_budget.patch
+gregkh-04-USB-gregkh-usb-041_usb-device_pointer.patch
+gregkh-04-USB-gregkh-usb-042_usb-hcd_fix_for_remove_hub_set_power_budget.patch
+gregkh-04-USB-gregkh-usb-043_usb-usbcore_usb_add_hcd.patch
+gregkh-04-USB-gregkh-usb-044_usb-hcds_no_more_register_root_hub.patch

Greg's USB tree

+mm-kconfig-kill-unused-arch_flatmem_disable.patch
+mm-kconfig-hide-memory-model-selection-menu.patch
+mm-kconfig-give-discontig-more-help-text.patch
+ppc64-kconfig-memory-models.patch

More sparsemem preparatory work

+generic_file_buffered_write-fixes.patch

pagecache I/O function fixes

+rlimit_as-checking-fix.patch

Fix checking of RLIMIT_AS

+mm-add-proc-zoneinfo.patch
+mm-add-proc-zoneinfo-tidy.patch

Add /proc/zoneinfo

+mm-rmapc-cleanup.patch

rmap.c cleanup

+mm-pcp-use-non-powers-of-2-for-batch-size.patch

Cache-colouring friendliness in per-cpu-pages

+mempool-nomemalloc-and-noretry.patch
+mempool-simplify-alloc.patch
+mempool-simplify-alloc-fix.patch
+mm-use-__gfp_nomemalloc.patch

Various mm cleanups

+doc-locking-update.patch

Update VFS Locking document

+count-bounce-buffer-pages-in-vmstat.patch

Add bounce-buffer accounting to /proc/vmstat

+rlimit_memlock-checking-fix.patch

Fix checking of RLIMIT_MEMLOCK

+sync_page-smp_mb-comment.patch

Comment update

+vm-merge_lru_pages.patch
+vm-page-cache-reclaim-core.patch
+vm-page-cache-reclaim-core-tidy.patch
+vm-reclaim_page_cache_node-syscall.patch
+vm-reclaim_page_cache_node-syscall-x86.patch
+vm-automatic-reclaim-through-mempolicy.patch

A whole bunch of stuff to permit program-controlled freeing of per-zone
pagecache pages. For big NUMA machines. This will probably be dropped -
seems too complex.

+mpage_writepages-page-locking-fix.patch
+drop-buffers-oops-fix.patch

VFS fixes

+proc-pid-smaps.patch
+proc-pid-smaps-tidy.patch

Add /proc/pid/smaps: detailed info about each vma's occupancy

+netfilter-debug-locking-fix.patch
+wireless-3crwe154g72-kconfig-help-fix.patch
+smc91c92_cs-reduce-stack-usage-in-smc91c92_event.patch
+typo-in-tulip-driver.patch
+tulip-fixes-for-uli5261.patch

Net fixes

-chelsio-build-fix.patch

Folded into a-new-10gb-ethernet-driver-by-chelsio-communications.patch

+selinux-cleanup-ipc_has_perm.patch
+selinux-add-finer-grained-permissions-to-netlink-audit.patch

SELinux fixes

+ppc32-refactor-fpu-exception-handling-2.patch
+ppc32-fix-for-misreported-sdram-size-on-radstone-ppc7d-platform.patch
+ppc32-add-rtc-hooks-in-ppc7d-platform-file.patch
+ppc32-fix-ide-related-crash-on-wakeup.patch
+macintosh-adbhidc-adb-buttons-support-for.patch
+ppc32-fix-a-sleep-issues-on-some-laptops.patch
+ppc32-fix-address-checking-on-lmw-stmw-align-exception.patch
+ppc32-workaround-for-spurious-irqs-on-pq2.patch
+ppc64-improve-g5-sound-headphone-mute.patch
+ppc32-add-sound-support-for-mac-mini.patch
+pmac-save-master-volume-on-sleep.patch
+ppc64-add-pt_note-section-to-vdso.patch
+ppc64-remove-unused-argument-to-create_slbe.patch
+ppc64-fix-irq-parsing-on-powermac.patch
+ppc64-nvram-cleanups.patch
+ppc64-update-to-use-the-new-4l-headers.patch
+ppc64-tell-firmware-about-kernel-capabilities.patch
+ppc64-remove-hot-busy-wait-loop-in-__hash_page.patch
+ppc64-noexec-fixes.patch
+ppc64-remove-unnecessary-include.patch
+ppc64-firmware-workaround.patch
+ppc64-enforce-medium-thread-priority-in-hypervisor-calls.patch
+ppc64-use-smp_mb-and-smp_wmb.patch
+use-smp_mb-wmb-rmb-where-possible.patch
+ppc64-reverse-prediction-on-spinlock-busy-loop-code.patch
+ppc64-fix-32-bit-signal-frame-back-link.patch

ppc32/ppc64 updates

+x86-reboot-add-reboot-fixup-for-gx1-cs5530a.patch
+x86-entrys-trap-return-fixes.patch
+enable-write-combining-for-server-works-le-rev-6.patch
+platform-smis-and-their-interferance-with-tsc-based-delay-calibration.patch
+cpuid-bug-and-inconsistency-fix.patch
+i386-fix-hpet-for-systems-that-dont-support.patch
+irq-and-pci_ids-for-intel-ich7dh-ich7-m-dh.patch
+hda_intel-intel-esb2-support.patch
+x86-port-lockless-mce-preparation.patch
+x86-port-lockless-mce-implementation.patch
+x86-port-lockless-mce-implementation-fix.patch
+cpuid-x87-bit-on-amd-falsely-marked-as-pni.patch
+x86_64-interrupt-handling-fix.patch
+increase-number-of-e820-entries-hard-limit-from-32-to-128.patch
+broadcast-ipi-race-condition-on-cpu-hotplug.patch
+linux-26x-vm86-interrupt-emulation-fixes.patch

Lots of x86 updates

+x86_64-dont-assume-bp-to-be-the-first-one-in-madt-mps.patch
+x86_64-i8259c-iso99-structure-initialization.patch
+x86-64-handle-empty-e820-regions-correctly.patch
+x86_64-fix-hpet-for-systems-that-dont-support-legacy.patch
+x86_64-saved_command_line-overflow-fix.patch
+x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree.patch

x86_64 updates

+xen-x86-add-macro-for-debugreg.patch
+xen-x86-use-new-macro-for-debugreg.patch
+xen-x86-rename-usermode-macro.patch
+xen-x86-rename-usermode-macro-fix.patch
+xen-x86-use-more-usermode-macro.patch
+xen-x86_64-add-macro-for-debugreg.patch
+xen-x86_64-use-more-usermode-macro.patch

Preparatory abstractions for Xen support

+sep-initializing-rework.patch
+sibling-map-initializing-rework.patch
+init-call-cleanup.patch
+cpu-state-clean-after-hot-remove.patch
+cpu-state-clean-after-hot-remove-fix.patch
+physical-cpu-hot-add.patch
+suspend-resume-smp-support.patch
+suspend-resume-smp-support-fix-2.patch
+swsusp-documentation-updates.patch
+swsusp-kill-config_pm_disk.patch
+s-t-ram-load-gdt-the-right-way.patch
+acpi-fix-video-docs.patch
+properly-stop-devices-before-poweroff.patch
+properly-stop-devices-before-poweroff-fix.patch
+hp100-fix-card-names.patch
+swsusp-kill-unneccessary-does_collide_order.patch
+swsusp-cleanup-whitespace.patch
+swsusp-fix-nr_copy_pages.patch

Power management stuff

+uml-fix-oops-related-to-exception-table.patch
+uml-add-nfsd-syscall-when-nfsd-is-modular.patch
+uml-fix-handling-of-no-fpx_regs.patch
+uml-workaround-old-problematic-sed-behaviour.patch
+uml-support-aes-i586-crypto-driver.patch
+uml-inline-empty-proc.patch
+uml-move-va_copy-conditional-def.patch
+uml-fix-syscall-table-by-including-subarchs-one-for-i386.patch
+uml-quick-fix-syscall-table-for-x86_64.patch
+uml-fix-syscall-table-by-including-subarchs-one-for-x86-64.patch
+uml-redo-console-locking.patch
+uml-hostfs-avoid-buffers.patch
+uml-commentary-about-forking-flag.patch
+uml-ubd-handle-readonly-status.patch

UML updates

+s390-regenerate-defconfig.patch
+s390-idle-timer-setup.patch
+s390-fix-memory-holes-and-cleanup-setup_arch.patch
+s390-default-storage-key.patch
+s390-cmm-guest-sender-id.patch
+s390-allow-longer-debug-feature-names.patch
+s390-dasd-readonly-attribute.patch
+s390-enable-write-barriers-in-the-dasd-driver.patch
+s390-dont-pad-cdl-blocks-for-write-requests.patch
+s390-remove-ioctl32-from-dasdcmb.patch
+s390-remove-ioctl32-from-crypto-driver.patch
+s390-cio-documentation.patch

S/390 update

+blk-use-find_first_zero_bit-in-blk_queue_start_tag.patch
+blk-remove-blk_queue_tag-real_max_depth-optimization.patch
+blk-remove-blk_tags_per_longmask.patch
+blk-cleanup-generic-tag-support-error-messages.patch

Block layer cleanups

+create-a-kstrdup-library-function-ppc-fix.patch
+kstrdup-convert-a-few-existing-implementations.patch

kstrdup() fixes

+kprobes-incorrect-handling-of-probes-on-ret-lret-instruction.patch
+kprobes-oops-in-unregister_kprobe.patch

kprobes fixes

+patch-kernel-support-non-incremental-26xy-stable-patches.patch

Mysterious kbuild futzing

+lifeview-flytv-platinum-fm-remote-control-support.patch
+lifeview-flytv-platinum-fm-remote-control-support-fix.patch

v4l device support

+kallsyms-c_symbol_prefix-support.patch

kallsyms fix

+noop-iosched-kill-on-merge-scan.patch

Make the no-op scheduler more no-oppy

+add-eownerdead-and-enotrecoverable-version-2.patch

Add errnos for robust mutexes

+nbd-dont-create-all-max_nbd-devices-by-default-all-the-time.patch
+nbd-dont-create-all-max_nbd-devices-by-default-all-the-time-fix.patch

Redce nbd reosurce consumption

+fix-rewriting-on-a-full-reiserfs-filesystem.patch

reiserfs fix

+generate-hotplug-events-for-cpu-online.patch

CPU hotplug feature

+vgacon-set-vc_hi_font_mask-correctly.patch

vgacon fix

+hangcheck-timer-update-to-090.patch

hangcheck timer update

+w1_therm-support-for-ds18b20-ds1822-thermal-sensors.patch

w1 driver update

+3c59x-only-put-the-device-into-d3-when-were-actually-using-wol.patch

3c59x power management fix

+consolidate-sigev_pad_size.patch

cleanup

+misc-verify_area-cleanups.patch

cleanup

+__attribute__-placement-fixes.patch

Be more consistent about placement of gcc extended keywords.

+leadtek-winfast-remote-controls.patch

Leadtek Winfast IR driver remote controls.

+fix-race-in-__block_prepare_write.patch
+fix-race-in-block_write_full_page.patch

VFS fixes

+reiserfs-journal_init-fix.patch

resierfs fix

+dontdiff-file-sorted-in-alphabet-order.patch

Alphasort the dontdiff file

+optimise-loop-driver-a-bit.patch
+optimise-loop-driver-a-bit-tidy.patch

Speed up the loop driver

+ipmi-fix-for-handling-bad-dmi-data.patch
+ipmi-fix-for-handling-bad-acpi-data.patch
+ipmi-fix-watchdog-so-the-device-can-be-reopened-on-an-unexpected-close.patch
+ipmi-enable-interrupts-on-the-bt-driver.patch
+ipmi-fix-a-deadlock.patch

IPMI driver updates

+streamline-preempt_count-type-across-archs.patch
+preempt_count-is-int-remove-cast-and-dont-assign-to.patch

Regularise preempt_count

+sn_console-make-sal_console_uart-static-again.patch

Make a symbol static

+consolidate-sys_shmat.patch

cleanup

+remove-redundant-vm_flags-clearing-from-madvisec.patch

Remove unneeded code

+fix-tpm-driver-maintainers-entry.patch

MAINTAINERS update

+fortuna-random-driver-fix.patch

halfmd4.o needs to be unconditionally linked

+new-valid_signal-function.patch
+convert-code-that-currently-tests-_nsig-directly-to-use-valid_signal.patch

Clean up and fix _NSIG checking.

+fix-include-order-in-mthca_memfreec.patch

infiniband driver niceness

+scan-all-enabled-ports-on-ata_piix.patch

Intel PIIX fix

+serial_cs-reduce-stack-usage-in-serial_event.patch

Reduce stack consumption

+makefile-fix-for-compatibility-with-emacs-ctags.patch

ctags fix

+timeout-at-boottime-with-nec3500a-and-others-when-inserted-a-cd-in-it.patch

Some CDROMs are really slow

+add-check-to-proc-devices-read-routines.patch

Add overrun checking to /proc/devices handler

+aio-remove-superfluous.patch
+aio-ring-tail.patch
+aio-remove-debug.patch
+aio-run-iocb.patch

AIO fixes

+hfs-hfsplus-dont-leak-s_fs_info-and-fix-an-oops.patch

HFS filesystem fix

-inotify-022-for-2612-rc1-mm4.patch
+inotify-44.patch

Another inotify release

+reiserfs-endianness-clone-struct-reiserfs_key.patch
+reiserfs-endianness-annotate-little-endian-objects.patch
+reiserfs-endianness-fix-endianness-bugs.patch
+reiserfs-endianness-comp_short_keys-cleanup.patch
+reiserfs-endianness-sanitize-reiserfs_key-union.patch

reiserfs endianness fixes

+cx88-dvb-oops-fix.patch
+dvb-cx22702-frontend-driver-update.patch
+v4l-msp3400-update.patch

Media driver updates

+ext3-reduce-allocate-with-reservation-lock-latencies.patch
+ext3-reduce-allocate-with-reservation-lock-latencies-tidy.patch

ext3 latency reduction

+kgdb-move-config-option-for-bad_syscall_exit.patch
+kgdb-fix-bad_syscall_exit-lockup.patch
+kgdb-x86_64-support-fix.patch

kgdb fixes

+rock-remove-MAYBE_CONTINUE-fix.patch

Fix rock-remove-MAYBE_CONTINUE.patch

-perfctr-core.patch
-perfctr-i386.patch
-perfctr-x86-core-updates.patch
-perfctr-x86-driver-updates.patch
-perfctr-x86-driver-cleanup.patch
-perfctr-prescott-fix.patch
-perfctr-x86-update-2.patch
-perfctr-x86_64.patch
-perfctr-x86_64-core-updates.patch
-perfctr-ppc.patch
-perfctr-ppc32-driver-update.patch
-perfctr-ppc32-mmcr0-handling-fixes.patch
-perfctr-ppc32-update.patch
-perfctr-ppc32-update-2.patch
-perfctr-virtualised-counters.patch
-perfctr-remap_page_range-fix.patch
-virtual-perfctr-illegal-sleep.patch
-make-perfctr_virtual-default-in-kconfig-match-recommendation.patch
-perfctr-ifdef-cleanup.patch
-perfctr-update-2-6-kconfig-related-updates.patch
-perfctr-virtual-updates.patch
-perfctr-virtual-cleanup.patch
-perfctr-ppc32-preliminary-interrupt-support.patch
-perfctr-update-5-6-reduce-stack-usage.patch
-perfctr-interrupt-support-kconfig-fix.patch
-perfctr-low-level-documentation.patch
-perfctr-inheritance-1-3-driver-updates.patch
-perfctr-inheritance-2-3-kernel-updates.patch
-perfctr-inheritance-3-3-documentation-updates.patch
-perfctr-inheritance-locking-fix.patch
-perfctr-api-changes-first-step.patch
-perfctr-virtual-update.patch
-perfctr-x86-64-ia32-emulation-fix.patch
-perfctr-sysfs-update-1-4-core.patch
-perfctr-sysfs-update.patch
-perfctr-sysfs-update-2-4-x86.patch
-perfctr-sysfs-update-3-4-x86-64.patch
-perfctr-sysfs-update-4-4-ppc32.patch
-perfctr-2710-api-update-1-4-common.patch
-perfctr-2710-api-update-2-4-i386.patch
-perfctr-2710-api-update-3-4-x86_64.patch
-perfctr-2710-api-update-4-4-ppc32.patch
-perfctr-api-update-1-9-physical-indexing-x86.patch
-perfctr-api-update-2-9-physical-indexing-ppc32.patch
-perfctr-api-update-3-9-cpu_control_header-x86.patch
-perfctr-api-update-4-9-cpu_control_header-ppc32.patch
-perfctr-api-update-5-9-cpu_control_header-common.patch
-perfctr-api-update-6-9-cpu_control-access-common.patch
-perfctr-api-update-7-9-cpu_control-access-x86.patch
-perfctr-api-update-8-9-cpu_control-access-ppc32.patch
-perfctr-api-update-9-9-domain-based-read-write-syscalls.patch
-perfctr-ia32-syscalls-on-x86-64-fix.patch
-perfctr-cleanups-1-3-common.patch
-perfctr-cleanups-2-3-ppc32.patch
-perfctr-cleanups-3-3-x86.patch
-perfctr-x86-fix-and-cleanups.patch
-perfctr-ppc32-fix-and-cleanups.patch
-perfctr-64-bit-values-in-register-descriptors.patch
-perfctr-64-bit-values-in-register-descriptors-fix.patch
-perfctr-mapped-state-cleanup-x86.patch
-perfctr-mapped-state-cleanup-ppc32.patch
-perfctr-mapped-state-cleanup-common.patch
-perfctr-ppc64-arch-hooks.patch
-perfctr-common-updates-for-ppc64.patch
-perfctr-ppc64-driver-core.patch
-perfctr-x86-abi-update.patch
-perfctr-ppc32-abi-update.patch
-perfctr-ppc64-abi-update.patch
+perfctr.patch

Roll all the perfctr work into a single patch (for now)

+sched2-fix-smt-scheduling-problems-fix.patch

Folded into sched2-fix-smt-scheduling-problems.patch

+sched-remove-degenerate-domains-fix.patch

Folded into sched-remove-degenerate-domains.patch

+sched-rcu-domains-fix.patch

Folded into sched-rcu-domains.patch

-sched-unlocked-context-switches.patch

Dropped - nasty buggy.

+sched-changing-rt-priority-without-cap_sys_nice.patch

Permit tasks to reduce their realtime priority without CAP_SYS_NICE

+saa7134-add-oem-version-of-already-supported-card.patch

saa driver update

+split-general-cache-manager-from-cachefs-fix.patch

Fix split-general-cache-manager-from-cachefs.patch

+kexec-disable-preempt-in-panic.patch
+kexec-kexec-generic-fix.patch
+x86_64-kexec-build-fix.patch

kexec fixes

+kexec-s390-support.patch
+s390-kexec-fixes.patch

kexec-for-s390

+kdump-documentation-for-kdump-update.patch

Update kdump documentation

-add-acpi-based-floppy-controller-enumeration.patch

Dropped - we won't need this

+serial-update-nec-vr4100-series-serial-support.patch
+serial-add-siig-quartet-support.patch

MIPS serial driver updates

+altix-ioc4-serial-set-hfc-from-ioctl.patch
+altix-ioc4-serial-set-a-better-timeout-threshold.patch
+altix-ioc4-serial-small-uart-setup-mods.patch
+altix-ioc4-serial-arm-the-read-timeout-timer-before-the-first-read.patch

Altix serial driver updates

-kfree_skb-dump_stack.patch

Debug stuff dropped

+nvidiafb-ioremap-and-i2c-fixes.patch
+nvidiafb-ioremap-and-i2c-fixes-fix.patch
+fbdev-edidh-cleanups.patch
+fbcon-fix-check-after-use.patch
+intelfb-remove-intelfbdrvh.patch
+i810fb-fix-default-monitor-sync-timings.patch
+imxfb-add-freescale-imx-framebuffer-driver.patch
+better-pll-frequency-matching-for-tdfxfb-driver.patch
+clean-up-and-bug-fix-for-tdfxfb-framebuffer-size-detection.patch

framebuffer driver updates

+md-allow-md-to-update-multiple-superblocks-in-parallel-fix.patch

Fix md-allow-md-to-update-multiple-superblocks-in-parallel.patch

+docbook-use-custom-stylesheet.patch
+docbook-fix-html-link.patch

kernel-doc fixes

+documentation-remove-super-nr-max-to-reflect-fs-superc.patch

Documentation fix

+fuse-device-functions-comments-and-documentation-document-security-measures.patch
+fuse-read-only-operations-multiple-links-to-directory-fix.patch
+fuse-file-operations-interrupted-open-fix.patch
+fuse-mount-options-reference-counting-fix.patch
+fuse-mount-options-remove-allow_root-mount-option.patch
+fuse-tighten-check-for-processes-allowed-access.patch
+fuse-direct-i-o-disable-sendfile-with-direct_io.patch
+fuse-direct-i-o-nfsd-with-direct_io-fix.patch
+fuse-add-fsync-operation-for-directories-fix.patch

FUSE updates

+alsa-3073.patch
+alsa-3074.patch
+alsa-3075.patch
+alsa-3076.patch
+alsa-3077.patch
+alsa-3078.patch
+alsa-3079.patch
+alsa-3080.patch
+alsa-3081.patch
+alsa-3082.patch
+alsa-3083.patch
+alsa-3084.patch
+alsa-3085.patch
+alsa-3086.patch
+alsa-3087.patch
+alsa-3088.patch
+alsa-3091.patch
+alsa-3092.patch
+alsa-3093.patch
+alsa-3094.patch
+alsa-3095.patch
+alsa-3096.patch
+alsa-3097.patch
+alsa-3098.patch
+alsa-3099.patch
+alsa-3100.patch
+alsa-3101.patch
+alsa-3102.patch
+alsa-3103.patch
+alsa-3104.patch
+alsa-3105.patch
+alsa-3106.patch
+alsa-3107.patch
+alsa-3108.patch
+alsa-3111.patch
+alsa-3112.patch
+alsa-3113.patch
+alsa-3114.patch
+alsa-3115.patch
+alsa-3116.patch
+alsa-3117.patch
+alsa-3118.patch
+alsa-3119.patch
+alsa-3120.patch
+alsa-3121.patch
+alsa-3122.patch
+alsa-3123.patch
+alsa-3126.patch
+alsa-3128.patch
+alsa-3129.patch
+alsa-3130.patch
+alsa-3131.patch
+alsa-3132.patch
+alsa-3133.patch
+alsa-3134.patch
+alsa-3135.patch
+alsa-3136.patch
+alsa-3137.patch
+alsa-3138.patch
+alsa-3139.patch
+alsa-3140.patch
+alsa-3141.patch

ALSA tree

+drivers-serial-8250c-make-a-variable-static.patch
+kernel-irq-spuriousc-make-a-function-static.patch
+drivers-media-video-bttv-driverc-make-2-functions-static.patch
+drivers-media-video-cx88-possible-cleanups.patch
+drivers-media-video-saa7134-saa7134-dvbc-make-a-struct-static.patch

Make a few symbols static

+fs-udf-udftimec-fix-off-by-one-error.patch

UDF fix

+drivers-scsi-dpt-remove-versionh-dependencies.patch
+sound-oss-sscapec-remove-dead-code.patch

Cleanups

+unexport-uts_sem.patch

Don't export uts_sem to modules



number of patches in -mm: 963
number of changesets in external trees: 468
number of patches in -mm only: 950
total patches: 1418



All 963 patches:

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


2005-04-30 09:41:20

by Brice Goglin

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Hi Andrew,

CONFIG_X86_MCE_INTEL=y doesn't compile on my Compaq Evo
(except when CONFIG_SMP is set).
I had to include asm/apic.h in mce_intel.c to fix it.
Patch attached.

Signed-off-by: Brice Goglin <[email protected]>

Regards,
Brice


CC arch/i386/kernel/cpu/mcheck/mce_intel.o
arch/i386/kernel/cpu/mcheck/mce_intel.c: In function
`smp_thermal_interrupt':
arch/i386/kernel/cpu/mcheck/mce_intel.c:25: warning: implicit
declaration of function `ack_APIC_irq'
arch/i386/kernel/cpu/mcheck/mce_intel.c: In function `intel_init_thermal':
arch/i386/kernel/cpu/mcheck/mce_intel.c:67: warning: implicit
declaration of function `apic_read'
arch/i386/kernel/cpu/mcheck/mce_intel.c:67: error: `APIC_LVTTHMR'
undeclared (first use in this function)
arch/i386/kernel/cpu/mcheck/mce_intel.c:67: error: (Each undeclared
identifier is reported only once
arch/i386/kernel/cpu/mcheck/mce_intel.c:67: error: for each function it
appears in.)
arch/i386/kernel/cpu/mcheck/mce_intel.c:68: error: `APIC_DM_SMI'
undeclared (first use in this function)
arch/i386/kernel/cpu/mcheck/mce_intel.c:77: error: `APIC_VECTOR_MASK'
undeclared (first use in this function)
arch/i386/kernel/cpu/mcheck/mce_intel.c:85: error: `APIC_DM_FIXED'
undeclared (first use in this function)
arch/i386/kernel/cpu/mcheck/mce_intel.c:85: error: `APIC_LVT_MASKED'
undeclared (first use in this function)
arch/i386/kernel/cpu/mcheck/mce_intel.c:86: warning: implicit
declaration of function `apic_write_around'
make[3]: *** [arch/i386/kernel/cpu/mcheck/mce_intel.o] Error 1
make[2]: *** [arch/i386/kernel/cpu/mcheck] Error 2
make[1]: *** [arch/i386/kernel/cpu] Error 2
make: *** [arch/i386/kernel] Error 2


Attachments:
include_apic_in_intel_mce.patch (349.00 B)

2005-04-30 10:32:53

by Brice Goglin

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12-rc3-mm1
# Sat Apr 30 11:51:06 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="=Pignouf"
CONFIG_LOCALVERSION_AUTO=y
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=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_CPUSETS 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=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_MODVERSIONS=y
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=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=y
CONFIG_SMP=y
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_TSC=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_X86_REBOOTFIXUPS is not set
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m

#
# Firmware Drivers
#
CONFIG_EDD=m
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_FLATMEM=y
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_IRQBALANCE=y
CONFIG_HAVE_DEC_LOCK=y
# CONFIG_REGPARM is not set
CONFIG_SECCOMP=y

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

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

#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y
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 is not set
# 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=y
CONFIG_ACPI_CONTAINER=m

#
# APM (Advanced Power Management) BIOS Support
#
CONFIG_APM=m
# CONFIG_APM_IGNORE_USER_SUSPEND is not set
# CONFIG_APM_DO_ENABLE is not set
# CONFIG_APM_CPU_IDLE is not set
# CONFIG_APM_DISPLAY_BLANK is not set
# CONFIG_APM_RTC_IS_GMT is not set
# CONFIG_APM_ALLOW_INTS is not set
# CONFIG_APM_REAL_MODE_POWER_OFF is not set

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

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

#
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=y

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

#
# PCCARD (PCMCIA/CardBus) support
#
# CONFIG_PCCARD is not set

#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI 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

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

#
# Parallel port support
#
# CONFIG_PARPORT is not set

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

#
# Protocols
#
CONFIG_ISAPNP=y
CONFIG_PNPBIOS=y
CONFIG_PNPBIOS_PROC_FS=y
CONFIG_PNPACPI=y

#
# Block devices
#
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD 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 is not set
# 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=y
# CONFIG_CDROM_PKTCDVD 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 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=m
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_RZ1000 is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS 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 is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set

#
# SCSI Transport Attributes
#
CONFIG_SCSI_SPI_ATTRS=m
# 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_7000FASST is not set
# CONFIG_SCSI_ACARD is not set
# CONFIG_SCSI_AHA152X is not set
# CONFIG_SCSI_AHA1542 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_SCSI_IN2000 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_DTC3280 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_GENERIC_NCR5380 is not set
# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_IPR is not set
# CONFIG_SCSI_PAS16 is not set
# CONFIG_SCSI_PSI240I is not set
# CONFIG_SCSI_QLOGIC_FAS 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_SEAGATE is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_T128 is not set
# CONFIG_SCSI_U14_34F is not set
# CONFIG_SCSI_ULTRASTOR is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set

#
# Old CD-ROM drivers (not SCSI, not IDE)
#
# CONFIG_CD_NO_IDESCSI is not set

#
# Multi-device support (RAID and LVM)
#
CONFIG_MD=y
# CONFIG_BLK_DEV_MD is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_CRYPT is not set
# CONFIG_DM_SNAPSHOT is not set
# CONFIG_DM_MIRROR is not set
# CONFIG_DM_ZERO is not set
# CONFIG_DM_MULTIPATH 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 is not set

#
# I2O device support
#
# CONFIG_I2O is not set

#
# Networking support
#
CONFIG_NET=y

#
# Networking options
#
CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=m
# 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 is not set
# 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=y
# 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=y

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_CT_ACCT=y
# CONFIG_IP_NF_CONNTRACK_MARK is not set
# CONFIG_IP_NF_CT_PROTO_SCTP is not set
# CONFIG_IP_NF_FTP is not set
# CONFIG_IP_NF_IRC is not set
# 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 is not set
# CONFIG_IP_NF_MATCH_IPRANGE is not set
# CONFIG_IP_NF_MATCH_MAC is not set
# CONFIG_IP_NF_MATCH_PKTTYPE is not set
# CONFIG_IP_NF_MATCH_MARK is not set
# CONFIG_IP_NF_MATCH_MULTIPORT is not set
# 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=m
# 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 is not set
# 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_MANGLE=m
# CONFIG_IP_NF_TARGET_TOS is not set
# 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=y
# CONFIG_NETPOLL_RX is not set
# CONFIG_NETPOLL_TRAP is not set
CONFIG_NET_POLL_CONTROLLER=y
# 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=m
# 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
# CONFIG_LANCE is not set
# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_NET_VENDOR_RACAL is not set

#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_AT1700 is not set
# CONFIG_DEPCA is not set
# CONFIG_HP100 is not set
# CONFIG_NET_ISA 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_AC3200 is not set
# CONFIG_APRICOT is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_CS89x0 is not set
# CONFIG_DGRS is not set
# CONFIG_EEPRO100 is not set
CONFIG_E100=m
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_NET_POCKET 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 is not set
# CONFIG_SK98LIN is not set
# 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

#
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
# CONFIG_PPP_SYNC_TTY is not set
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPPOE=m
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
CONFIG_NETCONSOLE=m

#
# 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 is not set
# 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=m
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_MOUSE_INPORT is not set
# CONFIG_MOUSE_LOGIBM is not set
# CONFIG_MOUSE_PC110PAD 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 is not set
# CONFIG_SERIO_CT82C710 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=y
# CONFIG_SERIAL_8250_CONSOLE 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=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
CONFIG_NVRAM=m
# 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=y
# CONFIG_AGP_ALI is not set
# CONFIG_AGP_ATI is not set
# CONFIG_AGP_AMD is not set
# CONFIG_AGP_AMD64 is not set
CONFIG_AGP_INTEL=y
# CONFIG_AGP_NVIDIA is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_EFFICEON is not set
CONFIG_DRM=y
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_GAMMA is not set
# CONFIG_DRM_R128 is not set
# CONFIG_DRM_RADEON is not set
# CONFIG_DRM_I810 is not set
CONFIG_DRM_I830=m
CONFIG_DRM_I915=m
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_VIA is not set
# CONFIG_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=m
CONFIG_I2C_CHARDEV=m

#
# I2C Algorithms
#
# CONFIG_I2C_ALGOBIT is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALGOPCA is not set

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

#
# Hardware Sensors Chip support
#
CONFIG_I2C_SENSOR=m
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM75 is not set
# CONFIG_SENSORS_LM77 is not set
# CONFIG_SENSORS_LM78 is not set
# CONFIG_SENSORS_LM80 is not set
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM85 is not set
# CONFIG_SENSORS_LM87 is not set
# CONFIG_SENSORS_LM90 is not set
# CONFIG_SENSORS_LM92 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_SMSC47B397 is not set
# CONFIG_SENSORS_SIS5595 is not set
# CONFIG_SENSORS_SMSC47M1 is not set
# CONFIG_SENSORS_VIA686A is not set
# CONFIG_SENSORS_W83781D is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83627HF is not set

#
# Other I2C Chip support
#
# CONFIG_SENSORS_DS1337 is not set
CONFIG_SENSORS_EEPROM=m
# CONFIG_SENSORS_PCF8574 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_RTC8564 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not set

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

#
# Misc devices
#
# CONFIG_IBM_ASM is not set

#
# Multimedia devices
#
CONFIG_VIDEO_DEV=m

#
# Video For Linux
#

#
# Video Adapters
#
# CONFIG_VIDEO_BT848 is not set
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_STRADIS is not set
# CONFIG_VIDEO_ZR36120 is not set
# CONFIG_VIDEO_SAA7134 is not set
# CONFIG_VIDEO_MXB is not set
# CONFIG_VIDEO_DPC is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_CX88 is not set
# CONFIG_VIDEO_OVCAMCHIP is not set

#
# Radio Adapters
#
# CONFIG_RADIO_CADET is not set
# CONFIG_RADIO_RTRACK is not set
# CONFIG_RADIO_RTRACK2 is not set
# CONFIG_RADIO_AZTECH is not set
# CONFIG_RADIO_GEMTEK is not set
# CONFIG_RADIO_GEMTEK_PCI is not set
# CONFIG_RADIO_MAXIRADIO is not set
# CONFIG_RADIO_MAESTRO is not set
# CONFIG_RADIO_SF16FMI is not set
# CONFIG_RADIO_SF16FMR2 is not set
# CONFIG_RADIO_TERRATEC is not set
# CONFIG_RADIO_TRUST is not set
# CONFIG_RADIO_TYPHOON is not set
# CONFIG_RADIO_ZOLTRIX 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=y
# CONFIG_FB_INTEL_DEBUG is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON_OLD is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_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_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FONTS is not set
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y

#
# Logo configuration
#
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
# 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_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
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_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set

#
# ISA devices
#
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set
# CONFIG_SND_CS4232 is not set
# CONFIG_SND_CS4236 is not set
# CONFIG_SND_ES968 is not set
# CONFIG_SND_ES1688 is not set
# CONFIG_SND_ES18XX is not set
# CONFIG_SND_GUSCLASSIC is not set
# CONFIG_SND_GUSEXTREME is not set
# CONFIG_SND_GUSMAX is not set
# CONFIG_SND_INTERWAVE is not set
# CONFIG_SND_INTERWAVE_STB is not set
# CONFIG_SND_OPTI92X_AD1848 is not set
# CONFIG_SND_OPTI92X_CS4231 is not set
# CONFIG_SND_OPTI93X is not set
# CONFIG_SND_SB8 is not set
# CONFIG_SND_SB16 is not set
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_WAVEFRONT is not set
# CONFIG_SND_ALS100 is not set
# CONFIG_SND_AZT2320 is not set
# CONFIG_SND_CMI8330 is not set
# CONFIG_SND_DT019X is not set
# CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SSCAPE is not set

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

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

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
CONFIG_USB_BANDWIDTH=y
# 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 is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
CONFIG_USB_UHCI_HCD=m
# 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 is not set
# 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
# CONFIG_USB_VICAM is not set
# CONFIG_USB_DSBR is not set
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_OV511 is not set
# CONFIG_USB_SE401 is not set
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_STV680 is not set
# CONFIG_USB_PWC is not set

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

#
# USB port drivers
#

#
# USB Serial Converter support
#
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRPRIME is not set
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_CP2101 is not set
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
CONFIG_USB_SERIAL_VISOR=m
# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_GARMIN is not set
# CONFIG_USB_SERIAL_IPW is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
# CONFIG_USB_SERIAL_KEYSPAN is not set
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_SAFE is not set
# CONFIG_USB_SERIAL_TI is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
# CONFIG_USB_SERIAL_OMNINET 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 ATM/DSL drivers
#

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

#
# File systems
#
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y

#
# XFS support
#
# CONFIG_XFS_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=m
CONFIG_AUTOFS4_FS=m

#
# Caches
#
# CONFIG_FSCACHE is not set
CONFIG_FUSE_FS=m

#
# 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=850
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15"
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# CONFIG_DEVFS_FS is not set
CONFIG_DEVPTS_FS_XATTR=y
CONFIG_DEVPTS_FS_SECURITY=y
CONFIG_TMPFS=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS_SECURITY=y
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# 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=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
# CONFIG_NFSD_V4 is not set
# CONFIG_NFSD_TCP is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp850"
# 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="cp850"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
CONFIG_NLS_CODEPAGE_850=m
# 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=m
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=m

#
# Profiling support
#
# CONFIG_PROFILING is not set

#
# Kernel hacking
#
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOG_BUF_SHIFT=17
CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_SCHEDSTATS=y
# CONFIG_DEBUG_SLAB is not set
CONFIG_DEBUG_PREEMPT=y
# 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=y
CONFIG_DEBUG_FS=y
# 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=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
# 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=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_PENDING_IRQ=y
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_PC=y


Attachments:
config (36.54 kB)

2005-04-30 10:39:08

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Brice Goglin <[email protected]> wrote:
>
> Andrew Morton a ?crit :
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/
>
> Hi Andrew,
>
> dmesg is flooded with these messages when lo is up.
> I don't remember having ever seen this before.
> My .config is attached.
> Any idea ?
>
> Thanks,
> Brice
>
>
>
> PROTO=6 127.0.0.1:53809 127.0.0.1:631 L=52 S=0x00 I=41505 F=0x4000 T=64
> ip_local_deliver: bad loopback skb: PRE_ROUTING LOCAL_IN
> skb: pf=2 (unowned) dev=lo len=274
> PROTO=6 127.0.0.1:631 127.0.0.1:53809 L=274 S=0x00 I=15075 F=0x4000 T=64
> ip_local_deliver: bad loopback skb: PRE_ROUTING LOCAL_IN
> skb: pf=2 (unowned) dev=lo len=52
> PROTO=6 127.0.0.1:53809 127.0.0.1:631 L=52 S=0x00 I=41507 F=0x4000 T=64
> ip_local_deliver: bad loopback skb: PRE_ROUTING LOCAL_IN
> skb: pf=2 (unowned) dev=lo len=69

Beats me. Someone broke netfilter ;)

Turning off CONFIG_NETFILTER_DEBUG should shut the warnings up.

2005-04-30 11:11:11

by Alexander Nyberg

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

> - We're still miles away from 2.6.12. Lots of patches here, plus my
> collection of bugs-post-2.6.11 is vast. I'll start working through them
> again after 2.6.12-rc4 is available to testers.
>

Something is bad with my init process, so with debug patch below I'm
getting:
do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a

continuing forever. 0xffffe018 is inside the vsyscall page so could be
related but the eip should be there too in that case I think...
You have any candidates? I've failed to find any.

Index: mm/arch/i386/mm/fault.c
===================================================================
--- mm.orig/arch/i386/mm/fault.c 2005-04-30 12:49:17.000000000 +0200
+++ mm/arch/i386/mm/fault.c 2005-04-30 12:56:31.000000000 +0200
@@ -391,6 +391,8 @@
info.si_errno = 0;
/* info.si_code has been set above */
info.si_addr = (void __user *)address;
+ printk("%s: force_sig_info SIGSEV to %d, addr %lx, eip %lx\n",
+ __FUNCTION__, tsk->pid, address, regs->eip);
force_sig_info(SIGSEGV, &info, tsk);
return;
}


Also, this brought me to trying to find what has changed between the
versions which appears a little tricky. Do you think it would be
possible to set up your scripts that currently notify the author of a
patch about the inclusion to CC something like mm-commits list.

That way people can audit patches that have got in before the tarball is
released, it is easy to see what has gone in and when.

2005-04-30 11:26:48

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Alexander Nyberg <[email protected]> wrote:
>
> > - We're still miles away from 2.6.12. Lots of patches here, plus my
> > collection of bugs-post-2.6.11 is vast. I'll start working through them
> > again after 2.6.12-rc4 is available to testers.
> >
>
> Something is bad with my init process, so with debug patch below I'm
> getting:
> do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
> do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
> do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
> do_page_fault: force_sig_info SIGSEV to 1, addr ffffe018, eip b7fe576a
>
> continuing forever. 0xffffe018 is inside the vsyscall page so could be
> related but the eip should be there too in that case I think...
> You have any candidates? I've failed to find any.

Nope. The easiest way to identify this is to grab broken-out.tar.gz, the
series file and use quilt to do a bisection search. Ten compiles max.

If you're not interested in that, please share the .config.

> Index: mm/arch/i386/mm/fault.c
> ===================================================================
> --- mm.orig/arch/i386/mm/fault.c 2005-04-30 12:49:17.000000000 +0200
> +++ mm/arch/i386/mm/fault.c 2005-04-30 12:56:31.000000000 +0200
> @@ -391,6 +391,8 @@
> info.si_errno = 0;
> /* info.si_code has been set above */
> info.si_addr = (void __user *)address;
> + printk("%s: force_sig_info SIGSEV to %d, addr %lx, eip %lx\n",
> + __FUNCTION__, tsk->pid, address, regs->eip);
> force_sig_info(SIGSEGV, &info, tsk);
> return;
> }
>
>
> Also, this brought me to trying to find what has changed between the
> versions which appears a little tricky.

Well announce.txt tells you what was added and what was removed.

> Do you think it would be
> possible to set up your scripts that currently notify the author of a
> patch about the inclusion to CC something like mm-commits list.

Certainly could. I'll ask davem about getting a list set up.

> That way people can audit patches that have got in before the tarball is
> released, it is easy to see what has gone in and when.

2005-04-30 11:52:53

by Adrian Bunk

[permalink] [raw]
Subject: [-mm patch] SIS900 must select MII

This patch fixes the following compile error caused by bk-netdev:

<-- snip -->

...
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x98528): In function `sis900_get_settings':
: undefined reference to `mii_ethtool_gset'
drivers/built-in.o(.text+0x98538): In function `sis900_set_settings':
: undefined reference to `mii_ethtool_sset'
drivers/built-in.o(.text+0x98517): In function `sis900_get_link':
: undefined reference to `mii_link_ok'
drivers/built-in.o(.text+0x98547): In function `sis900_nway_reset':
: undefined reference to `mii_nway_restart'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->


Signed-off-by: Adrian Bunk <[email protected]>


--- linux-2.6.12-rc3-mm1/drivers/net/Kconfig.old 2005-04-30 13:47:25.000000000 +0200
+++ linux-2.6.12-rc3-mm1/drivers/net/Kconfig 2005-04-30 13:47:48.000000000 +0200
@@ -1543,8 +1543,9 @@
config SIS900
tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
depends on NET_PCI && PCI
select CRC32
+ select MII
---help---
This is a driver for the Fast Ethernet PCI network cards based on
the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
SiS 630 and SiS 540 chipsets. If you have one of those, say Y and

2005-04-30 12:27:59

by Ed Tomlinson

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Saturday 30 April 2005 02:16, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/
>
> - There's still a bug in the new timer code. ?If you think you hit it,
> ? please revert
>
> ????????timers-fixes-improvements-fix.patch?????????????????????then
> ????????timers-fixes-improvements-smp_processor_id-fix.patch????then
> ????????timers-fixes-improvements.patch
>
> ? or, better, fix the bug.
>
> - If you use mpt-fusion, beware that the CONFIG_* names got changed - if you
> ? blindly do `make oldconfig' you won't have any disks.
>
> - ia64 crashes when doing a PM poweroff. ?It's triggered by
> ? properly-stop-devices-before-poweroff.patch but appears to be an ia64 bug.
>
> - Lots of bk trees were dropped and lots of git trees and patch serieses
> ? were picked up. ?I think all the subsystem trees are here, but the bk ones
> ? are starting to rot. ?As far as I can tell, no subsystem maintainers are
> ? updating their bk trees (apart from acpi).ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/

Andrew,

If we stick with git it might make sense not to include a linux-patch. cogito
is quite fast to export using a commit id. Suspect some bandwidth could be
saved if you just stated the commit id that you based the mm patch on.

In case anyone is wondering how build this from a cogito/git db... Find the
cogito announcement on lkml install and update cogito. Then folliw the instructions
in the README and download the kernel's db. Next search lkml to find the commit id
of rc3 (a2755a80f40e5794ddc20e00f781af9d6320fafb) and verify you have it correct
with:

cg-mkpatch a2755a80f40e5794ddc20e00f781af9d6320fafb

then export a tree with

cg-export ../12-3-1 a2755a80f40e5794ddc20e00f781af9d6320fafb

and cd over to the new dir and patch with mm and have fun.

Thanks

Ed Tomlinson




2005-04-30 12:46:08

by Adrian Bunk

[permalink] [raw]
Subject: 2.6.12-rc3-mm1 doesn't boot

2.6.12-rc3-mm1 doesn't boot on my computer.

Comparing the point where booting stops with a boot from a working
kernel, the first line that isn't displayed is the line where init says
it's starting.

Ctrl-Alt-Del at this point reboots my computer.

Both 2.6.12-rc3 and 2.6.12-rc2-mm3 do boot.

My computer is a cheap desktop computer with one 1,8 GHz Athlon CPU.

I know what a binary search is, but since I currently need my computer
and I can't do 10 compile and reboot cycles today any hints which
patches are suspect of being guilty is appreciated.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-04-30 12:57:42

by Carlos Martín

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1 doesn't boot

On 4/30/05, Adrian Bunk <[email protected]> wrote:
> 2.6.12-rc3-mm1 doesn't boot on my computer.
>
> Comparing the point where booting stops with a boot from a working
> kernel, the first line that isn't displayed is the line where init says
> it's starting.
I got the same.
> Ctrl-Alt-Del at this point reboots my computer.
>
> Both 2.6.12-rc3 and 2.6.12-rc2-mm3 do boot.
>
> My computer is a cheap desktop computer with one 1,8 GHz Athlon CPU.
Mine's a P4 2.8GH
z
> I know what a binary search is, but since I currently need my computer
> and I can't do 10 compile and reboot cycles today any hints which
> patches are suspect of being guilty is appreciated.
I'll see if I can pinpoint some patch, but it'll take some time.

cmn
--
Carlos Mart?n http://www.cmartin.tk http://rpgscript.berlios.de

"I'll wager it's the most extraordinary thing to happen round here
since Queen Elizabeth's handmaid got hit by lightning and sprouted a
beard"
-- T. C. Boyle, "Water Music"

2005-04-30 13:25:53

by Alexander Nyberg

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

> - We're still miles away from 2.6.12. Lots of patches here, plus my
> collection of bugs-post-2.6.11 is vast. I'll start working through them
> again after 2.6.12-rc4 is available to testers.
>

sep-initializing-rework.patch doesn't even call sysenter_setup() on UP
boxes so it'll break the vsyscall instantly. This cannot even have been
boot-tested on UP...

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/broken-out/sep-initializing-rework.patch

2005-04-30 13:50:45

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, Apr 30, 2005 at 03:25:39PM +0200, Alexander Nyberg wrote:
> > - We're still miles away from 2.6.12. Lots of patches here, plus my
> > collection of bugs-post-2.6.11 is vast. I'll start working through them
> > again after 2.6.12-rc4 is available to testers.
> >
>
> sep-initializing-rework.patch doesn't even call sysenter_setup() on UP
> boxes so it'll break the vsyscall instantly. This cannot even have been
> boot-tested on UP...
>
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/broken-out/sep-initializing-rework.patch

Thanks for this email, reverting this patch fixed the boot problem I
reported.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-04-30 14:08:13

by Richard Purdie

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

2.6.12-rc3-mm1 fails to compile for an arm pxa sharp zaurus kernel:

LD .tmp_vmlinux1
fs/built-in.o(.text+0x39110): In function `smaps_pte_range':
task_mmc.c: undefined reference to `clean_pmd_entry'
make: *** [.tmp_vmlinux1] Error 1

Adding #include <asm/tlbflush.h> to fs/proc/task_mmu.c "fixes" this although
I doubt that's the correct thing to do.

The config I'm using is at http://www.rpsys.net/openzaurus/defconfig-c7x0
if needed.

I'm also seeing problems with CompactFlash cards (I also saw this with
2.6.12-rc2-mm3, other versions are untested). I'm using pcmcia-cs (not
pcmciautils) but that shouldn't be a problem as I understand things. The
card mounts fine as the machine boots and I can access it fine. Trying to
eject the card causes problems:

Normally I can execute "cardctl eject" and then remove the card. I trigger
the oops below however I try to eject the card under this kernel though.
(Note: I never physically remove it here although that will also trigger an
oops). I suspect this is a further problem with ide-cs (which nobody has
both the knowledge and time to fix) although I'm open to advice as to where
the fault lies:

root@c7x0:~# cardcmgr
cardmgr[1932]: watching 1 socket
root@c7x0:~# hda: Flash Card, CFA DISK drive
ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
hda: max request size: 128KiB
hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
hda: cache flushes not supported
hda: hda1
ide-cs: hda: Vcc = 3.3, Vpp = 0.0
hda: hda1

[drive gets automounted]

root@c7x0:~# umount /dev/hda1
root@c7x0:~# cardctl eject
Unable to handle kernel NULL pointer dereference at virtual address 00000010
pgd = c17ec000
[00000010] *pgd=a17a8031, *pte=00000000, *ppte=00000000
Internal error: Oops: 17 [#1]
Modules linked in:
CPU: 0
PC is at ide_drive_remove+0x1c/0x28
LR is at ide_drive_remove+0x20/0x28
pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
sp : c1685cb8 ip : c1685cc8 fp : c1685cc4
r10: c03ee404 r9 : c029b6e8 r8 : 00000000
r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
Control: 397F Table: A17EC000 DAC: 00000015
Process cardctl (pid: 2108, stack limit = 0xc1684194)
Stack: (0xc1685cb8 to 0xc1686000)
5ca0: c1685ce4
c1685cc8
5cc0: c012e4a4 c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c1685d04
c1685ce8
5ce0: c012dd38 c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c1685d20
c1685d08
[stack snipped]
Backtrace:
[<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
(device_release_driver+0xbc/0xc4)
[<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
(bus_remove_device+0x5c/0xa8)
r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
[<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
(device_del+0x40/0x80)
r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
[<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
(device_unregister+0x14/0x20)
r6 = 00000000 r5 = C03DD3A0 r4 = C029B860
[<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
(ide_unregister+0x6d0/0x8b0)
r4 = C029B778
[<c0151834>] (ide_unregister+0x0/0x8b0) from [<c015f270>]
(ide_release+0x64/0x68)
[<c015f20c>] (ide_release+0x0/0x68) from [<c015f4f4>] (ide_event+0xd4/0x674)
r5 = C1685E0C r4 = C1C10200
[<c015f420>] (ide_event+0x0/0x674) from [<c016fd18>]
(send_event_callback+0x64/0x6c)
[<c016fcb4>] (send_event_callback+0x0/0x6c) from [<c012db38>]
(bus_for_each_dev+0x60/0x8c)
r4 = 00000000
[<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c016fd50>]
(send_event+0x30/0x40)
r7 = 00000001 r6 = 00000001 r5 = 00000001 r4 = 00000008
[<c016fd20>] (send_event+0x0/0x40) from [<c0170128>] (ds_event+0xc0/0x210)
[<c0170068>] (ds_event+0x0/0x210) from [<c016aa64>] (send_event+0xd0/0x154)
[<c016a994>] (send_event+0x0/0x154) from [<c016ac8c>]
(socket_shutdown+0x18/0xfc)
r7 = 00000000 r6 = 00000000 r5 = C03EE404 r4 = C03EE404
[<c016ac74>] (socket_shutdown+0x0/0xfc) from [<c016b424>]
(socket_remove+0x14/0xa0)
r6 = 00000000 r5 = C03EE404 r4 = C03EE404
[<c016b410>] (socket_remove+0x0/0xa0) from [<c016bac4>]
(pcmcia_eject_card+0x94/0x98)
r5 = C03EE404 r4 = C03EE530
[<c016ba30>] (pcmcia_eject_card+0x0/0x98) from [<c0172db0>]
(ds_ioctl+0xa30/0xc14)
r6 = C03EE404 r5 = 0000640E r4 = 00000000
[<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
[<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
r7 = 00000000 r6 = 00000000 r5 = 00000003 r4 = C1BFFC80
[<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>] (sys_ioctl+0x40/0x64)
r8 = C001CFA4 r7 = 00000036 r6 = 0000640E r5 = FFFFFFF7
r4 = C1BFFC80
[<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
(ret_fast_syscall+0x0/0x2c)
r6 = BECC8D90 r5 = 00000000 r4 = 00000000
Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)

------------------------------------------------------

root@c7x0:~# cardmgr
cardmgr[1956]: watching 1 socket
root@c7x0:~# hda: Flash Card, CFA DISK drive
ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
hda: max request size: 128KiB
hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
hda: cache flushes not supported
hda: hda1
ide-cs: hda: Vcc = 3.3, Vpp = 0.0
hda: hda1

root@c7x0:~# cardctl eject

hda: status timeout: status=0x88 { Busy }

ide: failed opcode was: 0xec
hda: drive not ready for command
hda: status timeout: status=0x88 { Busy }

ide: failed opcode was: 0xec
hda: drive not ready for command
hda: status timeout: status=0x88 { Busy }

ide: failed opcode was: 0xec
hda: drive not ready for command

root@c7x0:~# cardctl insert
root@c7x0:~# Unable to handle kernel NULL pointer dereference at virtual
address 00000010
pgd = c1280000
[00000010] *pgd=a1250031, *pte=00000000, *ppte=00000000
Internal error: Oops: 17 [#1]
Modules linked in:
CPU: 0
PC is at ide_drive_remove+0x1c/0x28
LR is at ide_drive_remove+0x20/0x28
pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
sp : c113fbb4 ip : c113fbc4 fp : c113fbc0
r10: 00000000 r9 : c029b6e8 r8 : c029b6e8
r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
Control: 397F Table: A1280000 DAC: 00000015
Process cardmgr (pid: 1957, stack limit = 0xc113e194)
Stack: (0xc113fbb4 to 0xc1140000)
fba0: c113fbe0 c113fbc4
c012e4a4
fbc0: c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c113fc00 c113fbe4
c012dd38
fbe0: c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c113fc1c c113fc04
c012ce30
[stack snipped]
Backtrace:
[<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
(device_release_driver+0xbc/0xc4)
[<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
(bus_remove_device+0x5c/0xa8)
r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
[<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
(device_del+0x40/0x80)
r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
[<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
(device_unregister+0x14/0x20)
r6 = 00000000 r5 = C03DB0A0 r4 = C029B860
[<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
(ide_unregister+0x6d0/0x8b0)
r4 = C029B778
[<c0151834>] (ide_unregister+0x0/0x8b0) from [<c0152310>]
(ide_register_hw_with_fixup+0x1b8/0x1ec)
[<c0152158>] (ide_register_hw_with_fixup+0x0/0x1ec) from [<c015f200>]
(idecs_register+0xa4/0xb0)
[<c015f15c>] (idecs_register+0x0/0xb0) from [<c015f8c4>]
(ide_event+0x4a4/0x674)
r7 = C286000E r6 = C1C00460 r5 = C1F72A14 r4 = 00000000
[<c015f420>] (ide_event+0x0/0x674) from [<c016ffc0>]
(pcmcia_register_client+0x260/0x308)
[<c016fd60>] (pcmcia_register_client+0x0/0x308) from [<c015f3dc>]
(ide_attach+0xb8/0xfc)
[<c015f324>] (ide_attach+0x0/0xfc) from [<c016edb0>]
(pcmcia_device_probe+0xc0/0x18c)
r6 = C1F72A60 r5 = C0254BF0 r4 = C1F72A00
[<c016ecf0>] (pcmcia_device_probe+0x0/0x18c) from [<c012e230>]
(driver_probe_device+0x4c/0xb0)
r8 = 00000050 r7 = C012E294 r6 = 00000000 r5 = C0254C00
r4 = C1F72A60
[<c012e1e4>] (driver_probe_device+0x0/0xb0) from [<c012dbc4>]
(bus_for_each_drv+0x60/0x8c)
r6 = C1F72A60 r5 = C113FE60 r4 = 00000000
[<c012db64>] (bus_for_each_drv+0x0/0x8c) from [<c012e334>]
(device_attach+0x8c/0x98)
r7 = C012DF2C r6 = C113FEE4 r5 = C1F72B08 r4 = C1F72A60
[<c012e2a8>] (device_attach+0x0/0x98) from [<c012df54>]
(bus_rescan_devices_helper+0x28/0x40)
r5 = C113FEB8 r4 = C113FEE4
[<c012df2c>] (bus_rescan_devices_helper+0x0/0x40) from [<c012db38>]
(bus_for_each_dev+0x60/0x8c)
r4 = 00000000
[<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c012df90>]
(bus_rescan_devices+0x24/0x30)
r7 = 0001C070 r6 = C1F72A00 r5 = C050643C r4 = C03EC530
[<c012df6c>] (bus_rescan_devices+0x0/0x30) from [<c0172c84>]
(ds_ioctl+0x904/0xc14)
[<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
[<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
r7 = 00000000 r6 = 0001C070 r5 = 00000004 r4 = C1312800
[<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>] (sys_ioctl+0x40/0x64)
r8 = C001CFA4 r7 = 00000036 r6 = C050643C r5 = FFFFFFF7
r4 = C1312800
[<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
(ret_fast_syscall+0x0/0x2c)
r6 = 00034738 r5 = 00000001 r4 = 00000001
Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)

Regards,

Richard

2005-04-30 14:21:16

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Fri, Apr 29, 2005 at 11:16:53PM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.12-rc2-mm3:
>...
> +x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree.patch
>
> x86_64 updates
>...


This patch contains at least two bugs:


The static inline set_irq_info() is not available
for CONFIG_GENERIC_PENDING_IRQ=n, resulting in the following warning:

<-- snip -->

...
CC arch/i386/kernel/io_apic.o
arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
...

<-- snip -->


The second bug is that although irq.h defines set_irq_info() as a static
inline, this patch adds an empty function to kernel/irq/manage.c .

The second bug shadows the first bug, but both have to be fixed.


cu
Adrian

BTW: This patch is not in anyway x86_64 specific.

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-04-30 15:04:36

by Russell King

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, Apr 30, 2005 at 03:07:37PM +0100, Richard Purdie wrote:
> 2.6.12-rc3-mm1 fails to compile for an arm pxa sharp zaurus kernel:
>
> LD .tmp_vmlinux1
> fs/built-in.o(.text+0x39110): In function `smaps_pte_range':
> task_mmc.c: undefined reference to `clean_pmd_entry'
> make: *** [.tmp_vmlinux1] Error 1
>
> Adding #include <asm/tlbflush.h> to fs/proc/task_mmu.c "fixes" this although
> I doubt that's the correct thing to do.

I think it has to - there's no way that asm/pgtable.h can include
asm/tlbflush.h because asm/tlbflush.h needs vm_area_struct, which
is defined by linux/mm.h, which includes asm/pgtable.h before
vm_area_struct is defined.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core

2005-04-30 15:29:37

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

CC arch/i386/kernel/cpu/amd.o
CC arch/i386/kernel/cpu/cyrix.o
CC arch/i386/kernel/cpu/intel_cacheinfo.o
CC arch/i386/kernel/cpu/mcheck/init.o
CC arch/i386/kernel/cpu/mcheck/mce.o
CC arch/i386/kernel/cpu/mcheck/p5.o
CC arch/i386/kernel/cpu/mcheck/winchip.o
CC arch/i386/kernel/cpu/mcheck/mce_intel.o
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
In function `smp_thermal_interrupt':
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:25:
warning: implicit declaration of function `ack_APIC_irq'
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
In function `intel_init_thermal':
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
warning: implicit declaration of function `apic_read'
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
error: `APIC_LVTTHMR' undeclared (first use in this function)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
error: (Each undeclared identifie r is reported only once
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
error: for each function it appea rs in.)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:68:
error: `APIC_DM_SMI' undeclared ( first use in this function)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:77:
error: `APIC_VECTOR_MASK' undecla red (first use in this function)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
error: `APIC_DM_FIXED' undeclared (first use in this function)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
error: `APIC_LVT_MASKED' undeclar ed (first use in this function)
/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:86:
warning: implicit declaration of function `apic_write_around'
make[4]: *** [arch/i386/kernel/cpu/mcheck/mce_intel.o] Error 1
make[3]: *** [arch/i386/kernel/cpu/mcheck] Error 2
make[2]: *** [arch/i386/kernel/cpu] Error 2
make[1]: *** [arch/i386/kernel] Error 2
make: *** [_all] Error 2

--
Coywolf Qi Hunt
http://sosdg.org/~coywolf/

2005-04-30 15:37:55

by Zwane Mwaikambo

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Coywolf Qi Hunt wrote:

> CC arch/i386/kernel/cpu/amd.o
> CC arch/i386/kernel/cpu/cyrix.o
> CC arch/i386/kernel/cpu/intel_cacheinfo.o
> CC arch/i386/kernel/cpu/mcheck/init.o
> CC arch/i386/kernel/cpu/mcheck/mce.o
> CC arch/i386/kernel/cpu/mcheck/p5.o
> CC arch/i386/kernel/cpu/mcheck/winchip.o
> CC arch/i386/kernel/cpu/mcheck/mce_intel.o
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
> In function `smp_thermal_interrupt':
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:25:
> warning: implicit declaration of function `ack_APIC_irq'
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
> In function `intel_init_thermal':
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> warning: implicit declaration of function `apic_read'
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> error: `APIC_LVTTHMR' undeclared (first use in this function)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> error: (Each undeclared identifie r is reported only once
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> error: for each function it appea rs in.)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:68:
> error: `APIC_DM_SMI' undeclared ( first use in this function)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:77:
> error: `APIC_VECTOR_MASK' undecla red (first use in this function)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
> error: `APIC_DM_FIXED' undeclared (first use in this function)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
> error: `APIC_LVT_MASKED' undeclar ed (first use in this function)
> /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:86:
> warning: implicit declaration of function `apic_write_around'
> make[4]: *** [arch/i386/kernel/cpu/mcheck/mce_intel.o] Error 1
> make[3]: *** [arch/i386/kernel/cpu/mcheck] Error 2
> make[2]: *** [arch/i386/kernel/cpu] Error 2
> make[1]: *** [arch/i386/kernel] Error 2
> make: *** [_all] Error 2

Could you send your .config please?

Thanks,
Zwane

2005-04-30 15:44:38

by Brice Goglin

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Hi,

I posted this patch to fix this error (asm/apic.h must be included).

Regards,
Brice




Zwane Mwaikambo a ?crit :
> On Sat, 30 Apr 2005, Coywolf Qi Hunt wrote:
>
>
>> CC arch/i386/kernel/cpu/amd.o
>> CC arch/i386/kernel/cpu/cyrix.o
>> CC arch/i386/kernel/cpu/intel_cacheinfo.o
>> CC arch/i386/kernel/cpu/mcheck/init.o
>> CC arch/i386/kernel/cpu/mcheck/mce.o
>> CC arch/i386/kernel/cpu/mcheck/p5.o
>> CC arch/i386/kernel/cpu/mcheck/winchip.o
>> CC arch/i386/kernel/cpu/mcheck/mce_intel.o
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
>>In function `smp_thermal_interrupt':
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:25:
>>warning: implicit declaration of function `ack_APIC_irq'
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
>>In function `intel_init_thermal':
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
>>warning: implicit declaration of function `apic_read'
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
>>error: `APIC_LVTTHMR' undeclared (first use in this function)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
>>error: (Each undeclared identifie r is reported only once
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
>>error: for each function it appea rs in.)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:68:
>>error: `APIC_DM_SMI' undeclared ( first use in this function)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:77:
>>error: `APIC_VECTOR_MASK' undecla red (first use in this function)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
>>error: `APIC_DM_FIXED' undeclared (first use in this function)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
>>error: `APIC_LVT_MASKED' undeclar ed (first use in this function)
>>/home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:86:
>>warning: implicit declaration of function `apic_write_around'
>>make[4]: *** [arch/i386/kernel/cpu/mcheck/mce_intel.o] Error 1
>>make[3]: *** [arch/i386/kernel/cpu/mcheck] Error 2
>>make[2]: *** [arch/i386/kernel/cpu] Error 2
>>make[1]: *** [arch/i386/kernel] Error 2
>>make: *** [_all] Error 2
>
>
> Could you send your .config please?
>
> Thanks,
> Zwane

--
Brice Goglin
================================================
Etudiant en These Bureau 343
Laboratoire de l'Informatique et du Parall?lisme
UMR CNRS-INRIA-ENS Lyon 5668
46, all?e d'Italie 69364 Lyon Cedex 07
T?l 04 72 72 87 59 Fax 04 72 72 80 80

Ph.D Student
Laboratoire de l'Informatique et du Parall?lisme
CNRS-ENS Lyon-INRIA-UCB Lyon
France


Attachments:
01_include_apic_in_intel_mce.patch (367.00 B)

2005-04-30 15:48:09

by Carlos Martín

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On 4/30/05, Zwane Mwaikambo <[email protected]> wrote:

> Could you send your .config please?
This was solved on the first response in this thread. Just #include
<asm/apic.h> in
arch/i386/kernel/cpu/mcheck/mce_intel.c

cmn
--
Carlos Mart?n http://www.cmartin.tk http://rpgscript.berlios.de

"I'll wager it's the most extraordinary thing to happen round here
since Queen Elizabeth's handmaid got hit by lightning and sprouted a
beard"
-- T. C. Boyle, "Water Music"

2005-04-30 15:50:15

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On 4/30/05, Zwane Mwaikambo <[email protected]> wrote:
> On Sat, 30 Apr 2005, Coywolf Qi Hunt wrote:
>
> > CC arch/i386/kernel/cpu/amd.o
> > CC arch/i386/kernel/cpu/cyrix.o
> > CC arch/i386/kernel/cpu/intel_cacheinfo.o
> > CC arch/i386/kernel/cpu/mcheck/init.o
> > CC arch/i386/kernel/cpu/mcheck/mce.o
> > CC arch/i386/kernel/cpu/mcheck/p5.o
> > CC arch/i386/kernel/cpu/mcheck/winchip.o
> > CC arch/i386/kernel/cpu/mcheck/mce_intel.o
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
> > In function `smp_thermal_interrupt':
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:25:
> > warning: implicit declaration of function `ack_APIC_irq'
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:
> > In function `intel_init_thermal':
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> > warning: implicit declaration of function `apic_read'
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> > error: `APIC_LVTTHMR' undeclared (first use in this function)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> > error: (Each undeclared identifie r is reported only once
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:67:
> > error: for each function it appea rs in.)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:68:
> > error: `APIC_DM_SMI' undeclared ( first use in this function)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:77:
> > error: `APIC_VECTOR_MASK' undecla red (first use in this function)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
> > error: `APIC_DM_FIXED' undeclared (first use in this function)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:85:
> > error: `APIC_LVT_MASKED' undeclar ed (first use in this function)
> > /home/coywolf/2.6.12-rc3-mm1-cy/arch/i386/kernel/cpu/mcheck/mce_intel.c:86:
> > warning: implicit declaration of function `apic_write_around'
> > make[4]: *** [arch/i386/kernel/cpu/mcheck/mce_intel.o] Error 1
> > make[3]: *** [arch/i386/kernel/cpu/mcheck] Error 2
> > make[2]: *** [arch/i386/kernel/cpu] Error 2
> > make[1]: *** [arch/i386/kernel] Error 2
> > make: *** [_all] Error 2
>
> Could you send your .config please?
>
> Thanks,
> Zwane
>
>

It's CONFIG_X86_MCE=y.
--
Coywolf Qi Hunt
http://sosdg.org/~coywolf/


Attachments:
(No filename) (2.49 kB)
.config.old (26.15 kB)
Download all attachments

2005-04-30 15:59:48

by Zwane Mwaikambo

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Brice Goglin wrote:

> I posted this patch to fix this error (asm/apic.h must be included).

Yes thanks, wasn't test compiled on UP :/

2005-04-30 16:42:46

by Zwane Mwaikambo

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Adrian Bunk wrote:

> The static inline set_irq_info() is not available
> for CONFIG_GENERIC_PENDING_IRQ=n, resulting in the following warning:

This could have been compile tested more :/

> CC arch/i386/kernel/io_apic.o
> arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
> arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
> ...
>
> <-- snip -->
>
>
> The second bug is that although irq.h defines set_irq_info() as a static
> inline, this patch adds an empty function to kernel/irq/manage.c .

That stuff shouldn't even be built on UP (altough it does provide more
coverage)

Signed-off-by: Zwane Mwaikambo <[email protected]>

Index: linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c
===================================================================
RCS file: /home/cvsroot/linux-2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 io_apic.c
--- linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c 30 Apr 2005 15:29:08 -0000 1.1.1.1
+++ linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c 30 Apr 2005 16:19:06 -0000
@@ -221,6 +221,7 @@ static void clear_IO_APIC (void)
clear_IO_APIC_pin(apic, pin);
}

+#ifdef CONFIG_SMP
static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
{
unsigned long flags;
@@ -252,8 +253,6 @@ static void set_ioapic_affinity_irq(unsi
spin_unlock_irqrestore(&ioapic_lock, flags);
}

-#ifdef CONFIG_SMP
-
#if defined(CONFIG_IRQBALANCE)
# include <asm/processor.h> /* kernel_thread() */
# include <linux/kernel_stat.h> /* kstat */
@@ -816,6 +815,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
* we need to reprogram the ioredtbls to cater for the cpus which have come online
* so mask in all cases should simply be TARGET_CPUS
*/
+#ifdef CONFIG_SMP
void __init setup_ioapic_dest(void)
{
int pin, ioapic, irq, irq_entry;
@@ -834,6 +834,7 @@ void __init setup_ioapic_dest(void)

}
}
+#endif

/*
* EISA Edge/Level control register, ELCR
@@ -1973,6 +1974,7 @@ static void unmask_IO_APIC_vector (unsig
unmask_IO_APIC_irq(irq);
}

+#ifdef CONFIG_SMP
static void set_ioapic_affinity_vector (unsigned int vector,
cpumask_t cpu_mask)
{
@@ -1982,6 +1984,7 @@ static void set_ioapic_affinity_vector (
set_ioapic_affinity_irq(irq, cpu_mask);
}
#endif
+#endif

/*
* Level and edge triggered IO-APIC interrupts need different handling,
@@ -1999,7 +2002,9 @@ static struct hw_interrupt_type ioapic_e
.disable = disable_edge_ioapic,
.ack = ack_edge_ioapic,
.end = end_edge_ioapic,
+#ifdef CONFIG_SMP
.set_affinity = set_ioapic_affinity,
+#endif
};

static struct hw_interrupt_type ioapic_level_type = {
@@ -2010,7 +2015,9 @@ static struct hw_interrupt_type ioapic_l
.disable = disable_level_ioapic,
.ack = mask_and_ack_level_ioapic,
.end = end_level_ioapic,
+#ifdef CONFIG_SMP
.set_affinity = set_ioapic_affinity,
+#endif
};

static inline void init_IO_APIC_traps(void)

2005-04-30 17:08:27

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On 5/1/05, Zwane Mwaikambo <[email protected]> wrote:
> On Sat, 30 Apr 2005, Adrian Bunk wrote:
>
> > The static inline set_irq_info() is not available
> > for CONFIG_GENERIC_PENDING_IRQ=n, resulting in the following warning:
>
> This could have been compile tested more :/
>
> > CC arch/i386/kernel/io_apic.o
> > arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
> > arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
> > ...
> >
> > <-- snip -->
> >
> >
> > The second bug is that although irq.h defines set_irq_info() as a static
> > inline, this patch adds an empty function to kernel/irq/manage.c .
>
> That stuff shouldn't even be built on UP (altough it does provide more
> coverage)
>
> Signed-off-by: Zwane Mwaikambo <[email protected]>
>
> Index: linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c
> ===================================================================
> RCS file: /home/cvsroot/linux-2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c,v
> retrieving revision 1.1.1.1
> diff -u -p -B -r1.1.1.1 io_apic.c
> --- linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c 30 Apr 2005 15:29:08 -0000 1.1.1.1
> +++ linux-2.6.12-rc3-mm1-up/arch/i386/kernel/io_apic.c 30 Apr 2005 16:19:06 -0000
> @@ -221,6 +221,7 @@ static void clear_IO_APIC (void)
> clear_IO_APIC_pin(apic, pin);
> }
>
> +#ifdef CONFIG_SMP
> static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
> {
> unsigned long flags;
> @@ -252,8 +253,6 @@ static void set_ioapic_affinity_irq(unsi
> spin_unlock_irqrestore(&ioapic_lock, flags);
> }
>
> -#ifdef CONFIG_SMP
> -
> #if defined(CONFIG_IRQBALANCE)
> # include <asm/processor.h> /* kernel_thread() */
> # include <linux/kernel_stat.h> /* kstat */
> @@ -816,6 +815,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
> * we need to reprogram the ioredtbls to cater for the cpus which have come online
> * so mask in all cases should simply be TARGET_CPUS
> */
> +#ifdef CONFIG_SMP
> void __init setup_ioapic_dest(void)
> {
> int pin, ioapic, irq, irq_entry;
> @@ -834,6 +834,7 @@ void __init setup_ioapic_dest(void)
>
> }
> }
> +#endif
>
> /*
> * EISA Edge/Level control register, ELCR
> @@ -1973,6 +1974,7 @@ static void unmask_IO_APIC_vector (unsig
> unmask_IO_APIC_irq(irq);
> }
>
> +#ifdef CONFIG_SMP
> static void set_ioapic_affinity_vector (unsigned int vector,
> cpumask_t cpu_mask)
> {
> @@ -1982,6 +1984,7 @@ static void set_ioapic_affinity_vector (
> set_ioapic_affinity_irq(irq, cpu_mask);
> }
> #endif
> +#endif
>
> /*
> * Level and edge triggered IO-APIC interrupts need different handling,
> @@ -1999,7 +2002,9 @@ static struct hw_interrupt_type ioapic_e
> .disable = disable_edge_ioapic,
> .ack = ack_edge_ioapic,
> .end = end_edge_ioapic,
> +#ifdef CONFIG_SMP
> .set_affinity = set_ioapic_affinity,
> +#endif
> };
>
> static struct hw_interrupt_type ioapic_level_type = {
> @@ -2010,7 +2015,9 @@ static struct hw_interrupt_type ioapic_l
> .disable = disable_level_ioapic,
> .ack = mask_and_ack_level_ioapic,
> .end = end_level_ioapic,
> +#ifdef CONFIG_SMP
> .set_affinity = set_ioapic_affinity,
> +#endif
> };
>
> static inline void init_IO_APIC_traps(void)

I was trying to fix this too. You are quicker and better than me. In
addition, this redundant include should be removed.

diff -pruN 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c
2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c
--- 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2005-04-30
19:15:46.000000000 +0800
+++ 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c 2005-05-01
00:49:27.000000000 +0800
@@ -32,7 +32,6 @@
#include <linux/compiler.h>
#include <linux/acpi.h>
#include <linux/sysdev.h>
-#include <linux/irq.h>
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/desc.h>

--
Coywolf Qi Hunt
http://sosdg.org/~coywolf/

2005-04-30 18:08:45

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, May 01, 2005 at 01:05:52AM +0800, Coywolf Qi Hunt wrote:
...
> I was trying to fix this too. You are quicker and better than me. In
> addition, this redundant include should be removed.

s/redundant/duplicate/

OK, since Zwane thinks my patch is "good in that its minimal impact", here it is.
I've compile tested for SMP and UP.

This removes the compile warning: implicit declaration of function `set_irq_info' and a duplicate include line.

Signed-off-by: Coywolf Qi Hunt <[email protected]>
---

diff -pruN 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c
--- 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2005-04-30 19:15:46.000000000 +0800
+++ 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c 2005-05-01 00:49:27.000000000 +0800
@@ -32,7 +32,6 @@
#include <linux/compiler.h>
#include <linux/acpi.h>
#include <linux/sysdev.h>
-#include <linux/irq.h>
#include <asm/io.h>
#include <asm/smp.h>
#include <asm/desc.h>
diff -pruN 2.6.12-rc3-mm1/include/linux/irq.h 2.6.12-rc3-mm1-cy2/include/linux/irq.h
--- 2.6.12-rc3-mm1/include/linux/irq.h 2005-04-30 19:16:26.000000000 +0800
+++ 2.6.12-rc3-mm1-cy2/include/linux/irq.h 2005-05-01 00:51:31.000000000 +0800
@@ -161,6 +161,7 @@ static inline void set_irq_info(int irq,
#else
#define move_irq(x)
#define move_native_irq(x)
+extern void set_irq_info(unsigned int irq, cpumask_t mask);
#endif // CONFIG_GENERIC_PENDING_IRQ

extern int no_irq_affinity;

2005-04-30 18:31:04

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On 4/30/05, Adrian Bunk <[email protected]> wrote:
> On Fri, Apr 29, 2005 at 11:16:53PM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.12-rc2-mm3:
> >...
> > +x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree.patch
> >
> > x86_64 updates
> >...
>
> This patch contains at least two bugs:
>
> The static inline set_irq_info() is not available
> for CONFIG_GENERIC_PENDING_IRQ=n, resulting in the following warning:
>
> <-- snip -->
>
> ...
> CC arch/i386/kernel/io_apic.o
> arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
> arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
> ...
>
> <-- snip -->
>
> The second bug is that although irq.h defines set_irq_info() as a static
> inline, this patch adds an empty function to kernel/irq/manage.c .
>
> The second bug shadows the first bug, but both have to be fixed.

IMHO, there are no bugs at all, or at least not the kind of bugs you think.

--
Coywolf Qi Hunt
http://sosdg.org/~coywolf/

2005-04-30 18:56:19

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, May 01, 2005 at 02:08:23AM +0800, Coywolf Qi Hunt wrote:
> On Sun, May 01, 2005 at 01:05:52AM +0800, Coywolf Qi Hunt wrote:
> ...
> > I was trying to fix this too. You are quicker and better than me. In
> > addition, this redundant include should be removed.
>
> s/redundant/duplicate/
>
> OK, since Zwane thinks my patch is "good in that its minimal impact", here it is.
> I've compile tested for SMP and UP.
>
> This removes the compile warning: implicit declaration of function `set_irq_info' and a duplicate include line.
>
> Signed-off-by: Coywolf Qi Hunt <[email protected]>
> ---
>
> diff -pruN 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c
> --- 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2005-04-30 19:15:46.000000000 +0800
> +++ 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c 2005-05-01 00:49:27.000000000 +0800
> @@ -32,7 +32,6 @@
> #include <linux/compiler.h>
> #include <linux/acpi.h>
> #include <linux/sysdev.h>
> -#include <linux/irq.h>
> #include <asm/io.h>
> #include <asm/smp.h>
> #include <asm/desc.h>
> diff -pruN 2.6.12-rc3-mm1/include/linux/irq.h 2.6.12-rc3-mm1-cy2/include/linux/irq.h
> --- 2.6.12-rc3-mm1/include/linux/irq.h 2005-04-30 19:16:26.000000000 +0800
> +++ 2.6.12-rc3-mm1-cy2/include/linux/irq.h 2005-05-01 00:51:31.000000000 +0800
> @@ -161,6 +161,7 @@ static inline void set_irq_info(int irq,
> #else
> #define move_irq(x)
> #define move_native_irq(x)
> +extern void set_irq_info(unsigned int irq, cpumask_t mask);
> #endif // CONFIG_GENERIC_PENDING_IRQ
>
> extern int no_irq_affinity;


Is it planned that the empty set_irq_info() function in
kernel/irq/manage.c will ever contain real code?

If not, an empty static inline as in the CONFIG_PCI_MSI=y &&
CONFIG_GENERIC_PENDING_IRQ=y case would generate better code.


cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-04-30 18:58:42

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, May 01, 2005 at 02:30:57AM +0800, Coywolf Qi Hunt wrote:
> On 4/30/05, Adrian Bunk <[email protected]> wrote:
> > On Fri, Apr 29, 2005 at 11:16:53PM -0700, Andrew Morton wrote:
> > >...
> > > Changes since 2.6.12-rc2-mm3:
> > >...
> > > +x86-x86_64-deferred-handling-of-writes-to-proc-irq-xx-smp_affinitypatch-added-to-mm-tree.patch
> > >
> > > x86_64 updates
> > >...
> >
> > This patch contains at least two bugs:
> >
> > The static inline set_irq_info() is not available
> > for CONFIG_GENERIC_PENDING_IRQ=n, resulting in the following warning:
> >
> > <-- snip -->
> >
> > ...
> > CC arch/i386/kernel/io_apic.o
> > arch/i386/kernel/io_apic.c: In function `set_ioapic_affinity_irq':
> > arch/i386/kernel/io_apic.c:251: warning: implicit declaration of function `set_irq_info'
> > ...
> >
> > <-- snip -->
> >
> > The second bug is that although irq.h defines set_irq_info() as a static
> > inline, this patch adds an empty function to kernel/irq/manage.c .
> >
> > The second bug shadows the first bug, but both have to be fixed.
>
> IMHO, there are no bugs at all, or at least not the kind of bugs you think.

It depends on how you define "bug".

I agree it was perhaps a too harsh word.

What about "Code that could be improved."? ;-)

> Coywolf Qi Hunt

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-04-30 19:50:57

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

"Richard Purdie" <[email protected]> wrote:
>
> ...
> The config I'm using is at http://www.rpsys.net/openzaurus/defconfig-c7x0
> if needed.
>
> I'm also seeing problems with CompactFlash cards (I also saw this with
> 2.6.12-rc2-mm3, other versions are untested). I'm using pcmcia-cs (not
> pcmciautils) but that shouldn't be a problem as I understand things. The
> card mounts fine as the machine boots and I can access it fine. Trying to
> eject the card causes problems:
>
> Normally I can execute "cardctl eject" and then remove the card. I trigger
> the oops below however I try to eject the card under this kernel though.
> (Note: I never physically remove it here although that will also trigger an
> oops). I suspect this is a further problem with ide-cs (which nobody has
> both the knowledge and time to fix) although I'm open to advice as to where
> the fault lies:
>
> root@c7x0:~# cardcmgr
> cardmgr[1932]: watching 1 socket
> root@c7x0:~# hda: Flash Card, CFA DISK drive
> ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
> hda: max request size: 128KiB
> hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
> hda: cache flushes not supported
> hda: hda1
> ide-cs: hda: Vcc = 3.3, Vpp = 0.0
> hda: hda1
>
> [drive gets automounted]
>
> root@c7x0:~# umount /dev/hda1
> root@c7x0:~# cardctl eject
> Unable to handle kernel NULL pointer dereference at virtual address 00000010

It'd be very useful if you could test this on 2.6.12-rc3, please.

> pgd = c17ec000
> [00000010] *pgd=a17a8031, *pte=00000000, *ppte=00000000
> Internal error: Oops: 17 [#1]
> Modules linked in:
> CPU: 0
> PC is at ide_drive_remove+0x1c/0x28
> LR is at ide_drive_remove+0x20/0x28
> pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
> sp : c1685cb8 ip : c1685cc8 fp : c1685cc4
> r10: c03ee404 r9 : c029b6e8 r8 : 00000000
> r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
> r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
> Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
> Control: 397F Table: A17EC000 DAC: 00000015
> Process cardctl (pid: 2108, stack limit = 0xc1684194)
> Stack: (0xc1685cb8 to 0xc1686000)
> 5ca0: c1685ce4
> c1685cc8
> 5cc0: c012e4a4 c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c1685d04
> c1685ce8
> 5ce0: c012dd38 c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c1685d20
> c1685d08
> [stack snipped]
> Backtrace:
> [<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
> (device_release_driver+0xbc/0xc4)
> [<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
> (bus_remove_device+0x5c/0xa8)
> r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
> [<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
> (device_del+0x40/0x80)
> r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
> [<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
> (device_unregister+0x14/0x20)
> r6 = 00000000 r5 = C03DD3A0 r4 = C029B860
> [<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
> (ide_unregister+0x6d0/0x8b0)
> r4 = C029B778
> [<c0151834>] (ide_unregister+0x0/0x8b0) from [<c015f270>]
> (ide_release+0x64/0x68)
> [<c015f20c>] (ide_release+0x0/0x68) from [<c015f4f4>] (ide_event+0xd4/0x674)
> r5 = C1685E0C r4 = C1C10200
> [<c015f420>] (ide_event+0x0/0x674) from [<c016fd18>]
> (send_event_callback+0x64/0x6c)
> [<c016fcb4>] (send_event_callback+0x0/0x6c) from [<c012db38>]
> (bus_for_each_dev+0x60/0x8c)
> r4 = 00000000
> [<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c016fd50>]
> (send_event+0x30/0x40)
> r7 = 00000001 r6 = 00000001 r5 = 00000001 r4 = 00000008
> [<c016fd20>] (send_event+0x0/0x40) from [<c0170128>] (ds_event+0xc0/0x210)
> [<c0170068>] (ds_event+0x0/0x210) from [<c016aa64>] (send_event+0xd0/0x154)
> [<c016a994>] (send_event+0x0/0x154) from [<c016ac8c>]
> (socket_shutdown+0x18/0xfc)
> r7 = 00000000 r6 = 00000000 r5 = C03EE404 r4 = C03EE404
> [<c016ac74>] (socket_shutdown+0x0/0xfc) from [<c016b424>]
> (socket_remove+0x14/0xa0)
> r6 = 00000000 r5 = C03EE404 r4 = C03EE404
> [<c016b410>] (socket_remove+0x0/0xa0) from [<c016bac4>]
> (pcmcia_eject_card+0x94/0x98)
> r5 = C03EE404 r4 = C03EE530
> [<c016ba30>] (pcmcia_eject_card+0x0/0x98) from [<c0172db0>]
> (ds_ioctl+0xa30/0xc14)
> r6 = C03EE404 r5 = 0000640E r4 = 00000000
> [<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
> [<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
> r7 = 00000000 r6 = 00000000 r5 = 00000003 r4 = C1BFFC80
> [<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>] (sys_ioctl+0x40/0x64)
> r8 = C001CFA4 r7 = 00000036 r6 = 0000640E r5 = FFFFFFF7
> r4 = C1BFFC80
> [<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
> (ret_fast_syscall+0x0/0x2c)
> r6 = BECC8D90 r5 = 00000000 r4 = 00000000
> Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)
>
> ------------------------------------------------------
>
> root@c7x0:~# cardmgr
> cardmgr[1956]: watching 1 socket
> root@c7x0:~# hda: Flash Card, CFA DISK drive
> ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
> hda: max request size: 128KiB
> hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
> hda: cache flushes not supported
> hda: hda1
> ide-cs: hda: Vcc = 3.3, Vpp = 0.0
> hda: hda1
>
> root@c7x0:~# cardctl eject
>
> hda: status timeout: status=0x88 { Busy }
>
> ide: failed opcode was: 0xec
> hda: drive not ready for command
> hda: status timeout: status=0x88 { Busy }
>
> ide: failed opcode was: 0xec
> hda: drive not ready for command
> hda: status timeout: status=0x88 { Busy }
>
> ide: failed opcode was: 0xec
> hda: drive not ready for command
>
> root@c7x0:~# cardctl insert
> root@c7x0:~# Unable to handle kernel NULL pointer dereference at virtual
> address 00000010
> pgd = c1280000
> [00000010] *pgd=a1250031, *pte=00000000, *ppte=00000000
> Internal error: Oops: 17 [#1]
> Modules linked in:
> CPU: 0
> PC is at ide_drive_remove+0x1c/0x28
> LR is at ide_drive_remove+0x20/0x28
> pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
> sp : c113fbb4 ip : c113fbc4 fp : c113fbc0
> r10: 00000000 r9 : c029b6e8 r8 : c029b6e8
> r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
> r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
> Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
> Control: 397F Table: A1280000 DAC: 00000015
> Process cardmgr (pid: 1957, stack limit = 0xc113e194)
> Stack: (0xc113fbb4 to 0xc1140000)
> fba0: c113fbe0 c113fbc4
> c012e4a4
> fbc0: c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c113fc00 c113fbe4
> c012dd38
> fbe0: c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c113fc1c c113fc04
> c012ce30
> [stack snipped]
> Backtrace:
> [<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
> (device_release_driver+0xbc/0xc4)
> [<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
> (bus_remove_device+0x5c/0xa8)
> r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
> [<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
> (device_del+0x40/0x80)
> r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
> [<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
> (device_unregister+0x14/0x20)
> r6 = 00000000 r5 = C03DB0A0 r4 = C029B860
> [<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
> (ide_unregister+0x6d0/0x8b0)
> r4 = C029B778
> [<c0151834>] (ide_unregister+0x0/0x8b0) from [<c0152310>]
> (ide_register_hw_with_fixup+0x1b8/0x1ec)
> [<c0152158>] (ide_register_hw_with_fixup+0x0/0x1ec) from [<c015f200>]
> (idecs_register+0xa4/0xb0)
> [<c015f15c>] (idecs_register+0x0/0xb0) from [<c015f8c4>]
> (ide_event+0x4a4/0x674)
> r7 = C286000E r6 = C1C00460 r5 = C1F72A14 r4 = 00000000
> [<c015f420>] (ide_event+0x0/0x674) from [<c016ffc0>]
> (pcmcia_register_client+0x260/0x308)
> [<c016fd60>] (pcmcia_register_client+0x0/0x308) from [<c015f3dc>]
> (ide_attach+0xb8/0xfc)
> [<c015f324>] (ide_attach+0x0/0xfc) from [<c016edb0>]
> (pcmcia_device_probe+0xc0/0x18c)
> r6 = C1F72A60 r5 = C0254BF0 r4 = C1F72A00
> [<c016ecf0>] (pcmcia_device_probe+0x0/0x18c) from [<c012e230>]
> (driver_probe_device+0x4c/0xb0)
> r8 = 00000050 r7 = C012E294 r6 = 00000000 r5 = C0254C00
> r4 = C1F72A60
> [<c012e1e4>] (driver_probe_device+0x0/0xb0) from [<c012dbc4>]
> (bus_for_each_drv+0x60/0x8c)
> r6 = C1F72A60 r5 = C113FE60 r4 = 00000000
> [<c012db64>] (bus_for_each_drv+0x0/0x8c) from [<c012e334>]
> (device_attach+0x8c/0x98)
> r7 = C012DF2C r6 = C113FEE4 r5 = C1F72B08 r4 = C1F72A60
> [<c012e2a8>] (device_attach+0x0/0x98) from [<c012df54>]
> (bus_rescan_devices_helper+0x28/0x40)
> r5 = C113FEB8 r4 = C113FEE4
> [<c012df2c>] (bus_rescan_devices_helper+0x0/0x40) from [<c012db38>]
> (bus_for_each_dev+0x60/0x8c)
> r4 = 00000000
> [<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c012df90>]
> (bus_rescan_devices+0x24/0x30)
> r7 = 0001C070 r6 = C1F72A00 r5 = C050643C r4 = C03EC530
> [<c012df6c>] (bus_rescan_devices+0x0/0x30) from [<c0172c84>]
> (ds_ioctl+0x904/0xc14)
> [<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
> [<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
> r7 = 00000000 r6 = 0001C070 r5 = 00000004 r4 = C1312800
> [<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>] (sys_ioctl+0x40/0x64)
> r8 = C001CFA4 r7 = 00000036 r6 = C050643C r5 = FFFFFFF7
> r4 = C1312800
> [<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
> (ret_fast_syscall+0x0/0x2c)
> r6 = 00034738 r5 = 00000001 r4 = 00000001
> Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)
>
> Regards,
>
> Richard

2005-04-30 19:51:14

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1


Thanks, guys. I seem to have it limping along on UP now, partly with the
below.

Li, it's a bit awkward to be calling things by hand on SMP and with an
initcall on UP. Maybe something neater can be done there.

I quickly tested suspend/resume on UP. Appears to work.



arch/i386/kernel/sysenter.c | 10 ++++++++++
arch/i386/power/cpu.c | 2 ++
include/asm-i386/processor.h | 1 +
include/asm-i386/smp.h | 1 -
4 files changed, 13 insertions(+), 1 deletion(-)

diff -puN arch/i386/kernel/sysenter.c~sep-initializing-rework-fix arch/i386/kernel/sysenter.c
--- 25/arch/i386/kernel/sysenter.c~sep-initializing-rework-fix 2005-04-30 12:20:20.370077048 -0700
+++ 25-akpm/arch/i386/kernel/sysenter.c 2005-04-30 12:20:20.375076288 -0700
@@ -65,3 +65,13 @@ int __init sysenter_setup(void)

return 0;
}
+
+#ifndef CONFIG_SMP
+static int __init sysenter_sep_setup(void)
+{
+ sysenter_setup();
+ enable_sep_cpu();
+ return 0;
+}
+module_init(sysenter_sep_setup);
+#endif
diff -puN arch/i386/power/cpu.c~sep-initializing-rework-fix arch/i386/power/cpu.c
--- 25/arch/i386/power/cpu.c~sep-initializing-rework-fix 2005-04-30 12:20:20.371076896 -0700
+++ 25-akpm/arch/i386/power/cpu.c 2005-04-30 12:20:35.890717552 -0700
@@ -22,9 +22,11 @@
#include <linux/device.h>
#include <linux/suspend.h>
#include <linux/acpi.h>
+
#include <asm/uaccess.h>
#include <asm/acpi.h>
#include <asm/tlbflush.h>
+#include <asm/processor.h>

static struct saved_context saved_context;

diff -puN include/asm-i386/processor.h~sep-initializing-rework-fix include/asm-i386/processor.h
--- 25/include/asm-i386/processor.h~sep-initializing-rework-fix 2005-04-30 12:20:41.633844464 -0700
+++ 25-akpm/include/asm-i386/processor.h 2005-04-30 12:21:04.316396192 -0700
@@ -691,5 +691,6 @@ extern void select_idle_routine(const st
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)

extern unsigned long boot_option_idle_override;
+extern void enable_sep_cpu(void);

#endif /* __ASM_I386_PROCESSOR_H */
diff -puN include/asm-i386/smp.h~sep-initializing-rework-fix include/asm-i386/smp.h
--- 25/include/asm-i386/smp.h~sep-initializing-rework-fix 2005-04-30 12:20:45.463262304 -0700
+++ 25-akpm/include/asm-i386/smp.h 2005-04-30 12:20:53.140095248 -0700
@@ -38,7 +38,6 @@ extern cpumask_t cpu_sibling_map[];
extern cpumask_t cpu_core_map[];

extern int sysenter_setup(void);
-extern void enable_sep_cpu(void);

extern void smp_flush_tlb(void);
extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
_

2005-04-30 20:01:17

by Coywolf Qi Hunt

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On 5/1/05, Andrew Morton <[email protected]> wrote:
>
> Thanks, guys. I seem to have it limping along on UP now, partly with the
> below.
>
> Li, it's a bit awkward to be calling things by hand on SMP and with an
> initcall on UP. Maybe something neater can be done there.
>
> I quickly tested suspend/resume on UP. Appears to work.

Yes, this seems also fixe the compile warning:

CC arch/i386/power/cpu.o
/home/coywolf/2.6.12-rc3-mm1-cy2/arch/i386/power/cpu.c: In function
`__restore_processor_state':
/home/coywolf/2.6.12-rc3-mm1-cy2/arch/i386/power/cpu.c:137: warning:
implicit declaration of function `enable_sep_cpu'
LD arch/i386/power/built-in.o

I was trying to fix it too. You are quicker and better than me.


>
> arch/i386/kernel/sysenter.c | 10 ++++++++++
> arch/i386/power/cpu.c | 2 ++
> include/asm-i386/processor.h | 1 +
> include/asm-i386/smp.h | 1 -
> 4 files changed, 13 insertions(+), 1 deletion(-)
>
> diff -puN arch/i386/kernel/sysenter.c~sep-initializing-rework-fix arch/i386/kernel/sysenter.c
> --- 25/arch/i386/kernel/sysenter.c~sep-initializing-rework-fix 2005-04-30 12:20:20.370077048 -0700
> +++ 25-akpm/arch/i386/kernel/sysenter.c 2005-04-30 12:20:20.375076288 -0700
> @@ -65,3 +65,13 @@ int __init sysenter_setup(void)
>
> return 0;
> }
> +
> +#ifndef CONFIG_SMP
> +static int __init sysenter_sep_setup(void)
> +{
> + sysenter_setup();
> + enable_sep_cpu();
> + return 0;
> +}
> +module_init(sysenter_sep_setup);
> +#endif
> diff -puN arch/i386/power/cpu.c~sep-initializing-rework-fix arch/i386/power/cpu.c
> --- 25/arch/i386/power/cpu.c~sep-initializing-rework-fix 2005-04-30 12:20:20.371076896 -0700
> +++ 25-akpm/arch/i386/power/cpu.c 2005-04-30 12:20:35.890717552 -0700
> @@ -22,9 +22,11 @@
> #include <linux/device.h>
> #include <linux/suspend.h>
> #include <linux/acpi.h>
> +
> #include <asm/uaccess.h>
> #include <asm/acpi.h>
> #include <asm/tlbflush.h>
> +#include <asm/processor.h>
>
> static struct saved_context saved_context;
>
> diff -puN include/asm-i386/processor.h~sep-initializing-rework-fix include/asm-i386/processor.h
> --- 25/include/asm-i386/processor.h~sep-initializing-rework-fix 2005-04-30 12:20:41.633844464 -0700
> +++ 25-akpm/include/asm-i386/processor.h 2005-04-30 12:21:04.316396192 -0700
> @@ -691,5 +691,6 @@ extern void select_idle_routine(const st
> #define cache_line_size() (boot_cpu_data.x86_cache_alignment)
>
> extern unsigned long boot_option_idle_override;
> +extern void enable_sep_cpu(void);
>
> #endif /* __ASM_I386_PROCESSOR_H */
> diff -puN include/asm-i386/smp.h~sep-initializing-rework-fix include/asm-i386/smp.h
> --- 25/include/asm-i386/smp.h~sep-initializing-rework-fix 2005-04-30 12:20:45.463262304 -0700
> +++ 25-akpm/include/asm-i386/smp.h 2005-04-30 12:20:53.140095248 -0700
> @@ -38,7 +38,6 @@ extern cpumask_t cpu_sibling_map[];
> extern cpumask_t cpu_core_map[];
>
> extern int sysenter_setup(void);
> -extern void enable_sep_cpu(void);
>
> extern void smp_flush_tlb(void);
> extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
> _
>
>


--
Coywolf Qi Hunt
http://sosdg.org/~coywolf/

2005-04-30 22:05:00

by Richard Purdie

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Andrew Morton:
> It'd be very useful if you could test this on 2.6.12-rc3, please.

I can confirm that exactly the same happens with 2.6.12-rc3.

> "Richard Purdie" <[email protected]> wrote:
>>
>> ...
>> The config I'm using is at http://www.rpsys.net/openzaurus/defconfig-c7x0
>> if needed.
>>
>> I'm also seeing problems with CompactFlash cards (I also saw this with
>> 2.6.12-rc2-mm3, other versions are untested). I'm using pcmcia-cs (not
>> pcmciautils) but that shouldn't be a problem as I understand things. The
>> card mounts fine as the machine boots and I can access it fine. Trying to
>> eject the card causes problems:
>>
>> Normally I can execute "cardctl eject" and then remove the card. I
>> trigger
>> the oops below however I try to eject the card under this kernel though.
>> (Note: I never physically remove it here although that will also trigger
>> an
>> oops). I suspect this is a further problem with ide-cs (which nobody has
>> both the knowledge and time to fix) although I'm open to advice as to
>> where
>> the fault lies:
>>
>> root@c7x0:~# cardcmgr
>> cardmgr[1932]: watching 1 socket
>> root@c7x0:~# hda: Flash Card, CFA DISK drive
>> ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
>> hda: max request size: 128KiB
>> hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
>> hda: cache flushes not supported
>> hda: hda1
>> ide-cs: hda: Vcc = 3.3, Vpp = 0.0
>> hda: hda1
>>
>> [drive gets automounted]
>>
>> root@c7x0:~# umount /dev/hda1
>> root@c7x0:~# cardctl eject
>> Unable to handle kernel NULL pointer dereference at virtual address
>> 00000010
>> pgd = c17ec000
>> [00000010] *pgd=a17a8031, *pte=00000000, *ppte=00000000
>> Internal error: Oops: 17 [#1]
>> Modules linked in:
>> CPU: 0
>> PC is at ide_drive_remove+0x1c/0x28
>> LR is at ide_drive_remove+0x20/0x28
>> pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
>> sp : c1685cb8 ip : c1685cc8 fp : c1685cc4
>> r10: c03ee404 r9 : c029b6e8 r8 : 00000000
>> r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
>> r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
>> Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
>> Control: 397F Table: A17EC000 DAC: 00000015
>> Process cardctl (pid: 2108, stack limit = 0xc1684194)
>> Stack: (0xc1685cb8 to 0xc1686000)
>> 5ca0: c1685ce4
>> c1685cc8
>> 5cc0: c012e4a4 c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c1685d04
>> c1685ce8
>> 5ce0: c012dd38 c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c1685d20
>> c1685d08
>> [stack snipped]
>> Backtrace:
>> [<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
>> (device_release_driver+0xbc/0xc4)
>> [<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
>> (bus_remove_device+0x5c/0xa8)
>> r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
>> [<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
>> (device_del+0x40/0x80)
>> r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
>> [<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
>> (device_unregister+0x14/0x20)
>> r6 = 00000000 r5 = C03DD3A0 r4 = C029B860
>> [<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
>> (ide_unregister+0x6d0/0x8b0)
>> r4 = C029B778
>> [<c0151834>] (ide_unregister+0x0/0x8b0) from [<c015f270>]
>> (ide_release+0x64/0x68)
>> [<c015f20c>] (ide_release+0x0/0x68) from [<c015f4f4>]
>> (ide_event+0xd4/0x674)
>> r5 = C1685E0C r4 = C1C10200
>> [<c015f420>] (ide_event+0x0/0x674) from [<c016fd18>]
>> (send_event_callback+0x64/0x6c)
>> [<c016fcb4>] (send_event_callback+0x0/0x6c) from [<c012db38>]
>> (bus_for_each_dev+0x60/0x8c)
>> r4 = 00000000
>> [<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c016fd50>]
>> (send_event+0x30/0x40)
>> r7 = 00000001 r6 = 00000001 r5 = 00000001 r4 = 00000008
>> [<c016fd20>] (send_event+0x0/0x40) from [<c0170128>]
>> (ds_event+0xc0/0x210)
>> [<c0170068>] (ds_event+0x0/0x210) from [<c016aa64>]
>> (send_event+0xd0/0x154)
>> [<c016a994>] (send_event+0x0/0x154) from [<c016ac8c>]
>> (socket_shutdown+0x18/0xfc)
>> r7 = 00000000 r6 = 00000000 r5 = C03EE404 r4 = C03EE404
>> [<c016ac74>] (socket_shutdown+0x0/0xfc) from [<c016b424>]
>> (socket_remove+0x14/0xa0)
>> r6 = 00000000 r5 = C03EE404 r4 = C03EE404
>> [<c016b410>] (socket_remove+0x0/0xa0) from [<c016bac4>]
>> (pcmcia_eject_card+0x94/0x98)
>> r5 = C03EE404 r4 = C03EE530
>> [<c016ba30>] (pcmcia_eject_card+0x0/0x98) from [<c0172db0>]
>> (ds_ioctl+0xa30/0xc14)
>> r6 = C03EE404 r5 = 0000640E r4 = 00000000
>> [<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
>> [<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
>> r7 = 00000000 r6 = 00000000 r5 = 00000003 r4 = C1BFFC80
>> [<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>]
>> (sys_ioctl+0x40/0x64)
>> r8 = C001CFA4 r7 = 00000036 r6 = 0000640E r5 = FFFFFFF7
>> r4 = C1BFFC80
>> [<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
>> (ret_fast_syscall+0x0/0x2c)
>> r6 = BECC8D90 r5 = 00000000 r4 = 00000000
>> Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)
>>
>> ------------------------------------------------------
>>
>> root@c7x0:~# cardmgr
>> cardmgr[1956]: watching 1 socket
>> root@c7x0:~# hda: Flash Card, CFA DISK drive
>> ide0 at 0xc2860000-0xc2860007,0xc286000e on irq 40
>> hda: max request size: 128KiB
>> hda: 254464 sectors (130 MB) w/0KiB Cache, CHS=994/8/32
>> hda: cache flushes not supported
>> hda: hda1
>> ide-cs: hda: Vcc = 3.3, Vpp = 0.0
>> hda: hda1
>>
>> root@c7x0:~# cardctl eject
>>
>> hda: status timeout: status=0x88 { Busy }
>>
>> ide: failed opcode was: 0xec
>> hda: drive not ready for command
>> hda: status timeout: status=0x88 { Busy }
>>
>> ide: failed opcode was: 0xec
>> hda: drive not ready for command
>> hda: status timeout: status=0x88 { Busy }
>>
>> ide: failed opcode was: 0xec
>> hda: drive not ready for command
>>
>> root@c7x0:~# cardctl insert
>> root@c7x0:~# Unable to handle kernel NULL pointer dereference at virtual
>> address 00000010
>> pgd = c1280000
>> [00000010] *pgd=a1250031, *pte=00000000, *ppte=00000000
>> Internal error: Oops: 17 [#1]
>> Modules linked in:
>> CPU: 0
>> PC is at ide_drive_remove+0x1c/0x28
>> LR is at ide_drive_remove+0x20/0x28
>> pc : [<c0153b18>] lr : [<c0153b1c>] Not tainted
>> sp : c113fbb4 ip : c113fbc4 fp : c113fbc0
>> r10: 00000000 r9 : c029b6e8 r8 : c029b6e8
>> r7 : c029b8c0 r6 : c029b908 r5 : c0254ad0 r4 : c029b860
>> r3 : 00000000 r2 : c029b778 r1 : 00000003 r0 : c029b778
>> Flags: NzCv IRQs on FIQs on Mode SVC_32 Segment user
>> Control: 397F Table: A1280000 DAC: 00000015
>> Process cardmgr (pid: 1957, stack limit = 0xc113e194)
>> Stack: (0xc113fbb4 to 0xc1140000)
>> fba0: c113fbe0 c113fbc4
>> c012e4a4
>> fbc0: c0153b08 c029b860 c029bc90 c029b8c0 c0254650 c113fc00 c113fbe4
>> c012dd38
>> fbe0: c012e3f4 c029b860 c029bc90 c029b8c0 00000000 c113fc1c c113fc04
>> c012ce30
>> [stack snipped]
>> Backtrace:
>> [<c0153afc>] (ide_drive_remove+0x0/0x28) from [<c012e4a4>]
>> (device_release_driver+0xbc/0xc4)
>> [<c012e3e8>] (device_release_driver+0x0/0xc4) from [<c012dd38>]
>> (bus_remove_device+0x5c/0xa8)
>> r7 = C0254650 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
>> [<c012dcdc>] (bus_remove_device+0x0/0xa8) from [<c012ce30>]
>> (device_del+0x40/0x80)
>> r7 = 00000000 r6 = C029B8C0 r5 = C029BC90 r4 = C029B860
>> [<c012cdf0>] (device_del+0x0/0x80) from [<c012ce84>]
>> (device_unregister+0x14/0x20)
>> r6 = 00000000 r5 = C03DB0A0 r4 = C029B860
>> [<c012ce70>] (device_unregister+0x0/0x20) from [<c0151f04>]
>> (ide_unregister+0x6d0/0x8b0)
>> r4 = C029B778
>> [<c0151834>] (ide_unregister+0x0/0x8b0) from [<c0152310>]
>> (ide_register_hw_with_fixup+0x1b8/0x1ec)
>> [<c0152158>] (ide_register_hw_with_fixup+0x0/0x1ec) from [<c015f200>]
>> (idecs_register+0xa4/0xb0)
>> [<c015f15c>] (idecs_register+0x0/0xb0) from [<c015f8c4>]
>> (ide_event+0x4a4/0x674)
>> r7 = C286000E r6 = C1C00460 r5 = C1F72A14 r4 = 00000000
>> [<c015f420>] (ide_event+0x0/0x674) from [<c016ffc0>]
>> (pcmcia_register_client+0x260/0x308)
>> [<c016fd60>] (pcmcia_register_client+0x0/0x308) from [<c015f3dc>]
>> (ide_attach+0xb8/0xfc)
>> [<c015f324>] (ide_attach+0x0/0xfc) from [<c016edb0>]
>> (pcmcia_device_probe+0xc0/0x18c)
>> r6 = C1F72A60 r5 = C0254BF0 r4 = C1F72A00
>> [<c016ecf0>] (pcmcia_device_probe+0x0/0x18c) from [<c012e230>]
>> (driver_probe_device+0x4c/0xb0)
>> r8 = 00000050 r7 = C012E294 r6 = 00000000 r5 = C0254C00
>> r4 = C1F72A60
>> [<c012e1e4>] (driver_probe_device+0x0/0xb0) from [<c012dbc4>]
>> (bus_for_each_drv+0x60/0x8c)
>> r6 = C1F72A60 r5 = C113FE60 r4 = 00000000
>> [<c012db64>] (bus_for_each_drv+0x0/0x8c) from [<c012e334>]
>> (device_attach+0x8c/0x98)
>> r7 = C012DF2C r6 = C113FEE4 r5 = C1F72B08 r4 = C1F72A60
>> [<c012e2a8>] (device_attach+0x0/0x98) from [<c012df54>]
>> (bus_rescan_devices_helper+0x28/0x40)
>> r5 = C113FEB8 r4 = C113FEE4
>> [<c012df2c>] (bus_rescan_devices_helper+0x0/0x40) from [<c012db38>]
>> (bus_for_each_dev+0x60/0x8c)
>> r4 = 00000000
>> [<c012dad8>] (bus_for_each_dev+0x0/0x8c) from [<c012df90>]
>> (bus_rescan_devices+0x24/0x30)
>> r7 = 0001C070 r6 = C1F72A00 r5 = C050643C r4 = C03EC530
>> [<c012df6c>] (bus_rescan_devices+0x0/0x30) from [<c0172c84>]
>> (ds_ioctl+0x904/0xc14)
>> [<c0172380>] (ds_ioctl+0x0/0xc14) from [<c0095fa0>] (do_ioctl+0x6c/0xa0)
>> [<c0095f34>] (do_ioctl+0x0/0xa0) from [<c0096068>] (vfs_ioctl+0x94/0x328)
>> r7 = 00000000 r6 = 0001C070 r5 = 00000004 r4 = C1312800
>> [<c0095fd4>] (vfs_ioctl+0x0/0x328) from [<c009633c>]
>> (sys_ioctl+0x40/0x64)
>> r8 = C001CFA4 r7 = 00000036 r6 = C050643C r5 = FFFFFFF7
>> r4 = C1312800
>> [<c00962fc>] (sys_ioctl+0x0/0x64) from [<c001ce20>]
>> (ret_fast_syscall+0x0/0x2c)
>> r6 = 00034738 r5 = 00000001 r4 = 00000001
>> Code: e24020e8 e1a00002 e592301c e1a0e00f (e593f010)
>>
>> Regards,
>>
>> Richard
>
>

2005-04-30 22:08:43

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005 08:27:43 EDT, Ed Tomlinson said:

> If we stick with git it might make sense not to include a linux-patch. cogito
> is quite fast to export using a commit id. Suspect some bandwidth could be
> saved if you just stated the commit id that you based the mm patch on.

I suspect that the majority of people who build -mm kernels build -mm kernels
because they *weren't* using BK to pull the trees they were interested in.

Currently I can pull the pieces needed for a -mm kernel over a 56K modem
without *too* much pain, which means it's something I can easily do in an
evening. What would be the additional disk space requirements to store enough
of a git tree so I can pull the corresponding linus.patch myself, and how long
would it take to do at 56K? Also, what's the comparative CPU/bandwidth hit
on the server end for me to download the additional data if it's bundled
into Andrew's patch, versus me doing a 'git update' or whatever the command is?

I'm suspecting that it's less strain overall to just include the 180K or so that
the bzip'ed linus.patch takes than to make everybody pull the data needed to
create their own linus.patch


Attachments:
(No filename) (226.00 B)

2005-04-30 22:34:21

by Zwane Mwaikambo

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Ed Tomlinson wrote:

> If we stick with git it might make sense not to include a linux-patch. cogito
> is quite fast to export using a commit id. Suspect some bandwidth could be
> saved if you just stated the commit id that you based the mm patch on.
>
> In case anyone is wondering how build this from a cogito/git db... Find the
> cogito announcement on lkml install and update cogito. Then folliw the instructions
> in the README and download the kernel's db. Next search lkml to find the commit id
> of rc3 (a2755a80f40e5794ddc20e00f781af9d6320fafb) and verify you have it correct
> with:
>
> cg-mkpatch a2755a80f40e5794ddc20e00f781af9d6320fafb
>
> then export a tree with
>
> cg-export ../12-3-1 a2755a80f40e5794ddc20e00f781af9d6320fafb
>
> and cd over to the new dir and patch with mm and have fun.

That'd be a horribly convoluted procedure and make automation difficult,
-mm shouldn't be that difficult to use. Also linus.patch used to be the
current -bk snapshot.

2005-04-30 22:48:26

by Jesper Juhl

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Zwane Mwaikambo wrote:

> On Sat, 30 Apr 2005, Ed Tomlinson wrote:
>
> > If we stick with git it might make sense not to include a linux-patch. cogito
> > is quite fast to export using a commit id. Suspect some bandwidth could be
> > saved if you just stated the commit id that you based the mm patch on.
> >
> > In case anyone is wondering how build this from a cogito/git db... Find the
> > cogito announcement on lkml install and update cogito. Then folliw the instructions
> > in the README and download the kernel's db. Next search lkml to find the commit id
> > of rc3 (a2755a80f40e5794ddc20e00f781af9d6320fafb) and verify you have it correct
> > with:
> >
> > cg-mkpatch a2755a80f40e5794ddc20e00f781af9d6320fafb
> >
> > then export a tree with
> >
> > cg-export ../12-3-1 a2755a80f40e5794ddc20e00f781af9d6320fafb
> >
> > and cd over to the new dir and patch with mm and have fun.
>
> That'd be a horribly convoluted procedure and make automation difficult,
> -mm shouldn't be that difficult to use. Also linus.patch used to be the
> current -bk snapshot.

I agree. Getting a -mm kernel currently requires nothing more than patch -
that's good. Introducing a git/cogito requirement will reduce the
users/testers of -mm - not good.


--
Jesper Juhl


2005-04-30 22:53:52

by Ed Tomlinson

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Saturday 30 April 2005 18:36, Zwane Mwaikambo wrote:
> On Sat, 30 Apr 2005, Ed Tomlinson wrote:
>
> > If we stick with git it might make sense not to include a linux-patch. cogito
> > is quite fast to export using a commit id. Suspect some bandwidth could be
> > saved if you just stated the commit id that you based the mm patch on.
> >
> > In case anyone is wondering how build this from a cogito/git db... Find the
> > cogito announcement on lkml install and update cogito. Then folliw the instructions
> > in the README and download the kernel's db. Next search lkml to find the commit id
> > of rc3 (a2755a80f40e5794ddc20e00f781af9d6320fafb) and verify you have it correct
> > with:
> >
> > cg-mkpatch a2755a80f40e5794ddc20e00f781af9d6320fafb
> >
> > then export a tree with
> >
> > cg-export ../12-3-1 a2755a80f40e5794ddc20e00f781af9d6320fafb
> >
> > and cd over to the new dir and patch with mm and have fun.
>
> That'd be a horribly convoluted procedure and make automation difficult,
> -mm shouldn't be that difficult to use. Also linus.patch used to be the
> current -bk snapshot.

Huh? Assuming one already has a current git tree. Then all Andrew need do
is publish the commit id from Linus then the complicated procedure becomes

cd <checkedout git copy of kernel>
cg-update origin
cg-export ../<work dir> <commit id>
cd ../<work dir>
cp ../<default config> .config
bzcat ../<mm patch> | patch -p1
make oldconfig
make

No problem to script this at all. Also, I suspect what when tagging starts to be
used, that <commit id> will be an easily typeable string.

With bk there was an acceptable excuse not to use it. With git, aside from bandwidth
concerns (maybe mercurial can solve this), I do not see any good reason not to use it.

Ed Tomlinson

2005-04-30 23:03:10

by Zwane Mwaikambo

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005, Ed Tomlinson wrote:

> Huh? Assuming one already has a current git tree. Then all Andrew need do
> is publish the commit id from Linus then the complicated procedure becomes
>
> cd <checkedout git copy of kernel>
> cg-update origin
> cg-export ../<work dir> <commit id>
> cd ../<work dir>
> cp ../<default config> .config
> bzcat ../<mm patch> | patch -p1
> make oldconfig
> make
>
> No problem to script this at all. Also, I suspect what when tagging starts to be
> used, that <commit id> will be an easily typeable string.

Ok, now tell this to one of the users who tests kernels, now users also
need to know how to use git in order to test -mm. I'm thinking about the
case where someone reports a bug on LKML and we ask that they test latest
-mm, getting them to also understand git just to quickly test something is
silly. Also people tend to have other things to do so making things
even slightly more difficult doesn't win you testers. Maybe i'm just
lazy... *shrug*

2005-04-30 23:11:18

by Randy.Dunlap

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, 30 Apr 2005 17:05:43 -0600 (MDT) Zwane Mwaikambo wrote:

| On Sat, 30 Apr 2005, Ed Tomlinson wrote:
|
| > Huh? Assuming one already has a current git tree. Then all Andrew need do
| > is publish the commit id from Linus then the complicated procedure becomes
| >
| > cd <checkedout git copy of kernel>
| > cg-update origin
| > cg-export ../<work dir> <commit id>
| > cd ../<work dir>
| > cp ../<default config> .config
| > bzcat ../<mm patch> | patch -p1
| > make oldconfig
| > make
| >
| > No problem to script this at all. Also, I suspect what when tagging starts to be
| > used, that <commit id> will be an easily typeable string.
|
| Ok, now tell this to one of the users who tests kernels, now users also
| need to know how to use git in order to test -mm. I'm thinking about the
| case where someone reports a bug on LKML and we ask that they test latest
| -mm, getting them to also understand git just to quickly test something is
| silly. Also people tend to have other things to do so making things
| even slightly more difficult doesn't win you testers. Maybe i'm just
| lazy... *shrug*

Nope, you are correct...

---
~Randy

2005-05-01 08:51:44

by Shaohua Li

[permalink] [raw]
Subject: RE: 2.6.12-rc3-mm1

>Thanks, guys. I seem to have it limping along on UP now, partly with
the
>below.
>
>Li, it's a bit awkward to be calling things by hand on SMP and with an
>initcall on UP. Maybe something neater can be done there.
>
>I quickly tested suspend/resume on UP. Appears to work.
Thanks for fixing this. I apparently forgot testing it in UP, very sorry
for this. Yes, an initcall possibly isn't good. I'm now on vocation for
Chinese Labor holiday till May 7, so I might have no time to do it
before returning to office.

Thanks,
Shaohua

2005-05-01 13:09:52

by Ed Tomlinson

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Saturday 30 April 2005 19:10, Randy.Dunlap wrote:
> On Sat, 30 Apr 2005 17:05:43 -0600 (MDT) Zwane Mwaikambo wrote:
>
> | On Sat, 30 Apr 2005, Ed Tomlinson wrote:
> |
> | > Huh? Assuming one already has a current git tree. Then all Andrew need do
> | > is publish the commit id from Linus then the complicated procedure becomes
> | >
> | > cd <checkedout git copy of kernel>
> | > cg-update origin
> | > cg-export ../<work dir> <commit id>
> | > cd ../<work dir>
> | > cp ../<default config> .config
> | > bzcat ../<mm patch> | patch -p1
> | > make oldconfig
> | > make
> | >
> | > No problem to script this at all. Also, I suspect what when tagging starts to be
> | > used, that <commit id> will be an easily typeable string.
> |
> | Ok, now tell this to one of the users who tests kernels, now users also
> | need to know how to use git in order to test -mm. I'm thinking about the
> | case where someone reports a bug on LKML and we ask that they test latest
> | -mm, getting them to also understand git just to quickly test something is
> | silly. Also people tend to have other things to do so making things
> | even slightly more difficult doesn't win you testers. Maybe i'm just
> | lazy... *shrug*
>
> Nope, you are correct...

Actually you can look at this either way. Consider, you ask someone to test mm and
they have not built a kernel before. So they have to:

download a base kernel, untar it.
download a RCx patch and apply it
download the mm patch and apply it
take their current /proc/config.gz and place it in the current dir as .config
make oldconfig
make and install the kernel

using cogito in a few weeks this will translate to

install a distro package for cogito, which will probably give you the option of downloading the kernel.
export an RCx directory treedownload the mm patch and apply it
take their current /proc/config.gz and place it in the current dir as .config
make oldconfig
make and install the kernel

Which is a simpler process... Its just different.

BTW the most complex process, from a unexperienced user POV, is probably the
make oldconfig as most distros automate the build and install.

There is no point in going any further with this. We will have to see what
happens on the SCM front. What would be interesting is if the quilt scripts
were integrated into the SCM. Then Andrew would just have to publish a
commit id (or quilt id?).

Ed Tomlinson






2005-05-01 13:19:37

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sat, Apr 30, 2005 at 06:53:40PM -0400, Ed Tomlinson wrote:
> On Saturday 30 April 2005 18:36, Zwane Mwaikambo wrote:
> > On Sat, 30 Apr 2005, Ed Tomlinson wrote:
> >
> > > If we stick with git it might make sense not to include a linux-patch. cogito
> > > is quite fast to export using a commit id. Suspect some bandwidth could be
> > > saved if you just stated the commit id that you based the mm patch on.
> > >
> > > In case anyone is wondering how build this from a cogito/git db... Find the
> > > cogito announcement on lkml install and update cogito. Then folliw the instructions
> > > in the README and download the kernel's db. Next search lkml to find the commit id
> > > of rc3 (a2755a80f40e5794ddc20e00f781af9d6320fafb) and verify you have it correct
> > > with:
> > >
> > > cg-mkpatch a2755a80f40e5794ddc20e00f781af9d6320fafb
> > >
> > > then export a tree with
> > >
> > > cg-export ../12-3-1 a2755a80f40e5794ddc20e00f781af9d6320fafb
> > >
> > > and cd over to the new dir and patch with mm and have fun.
> >
> > That'd be a horribly convoluted procedure and make automation difficult,
> > -mm shouldn't be that difficult to use. Also linus.patch used to be the
> > current -bk snapshot.
>
> Huh? Assuming one already has a current git tree. Then all Andrew need do
> is publish the commit id from Linus then the complicated procedure becomes
>...
> With bk there was an acceptable excuse not to use it. With git, aside from bandwidth
> concerns (maybe mercurial can solve this), I do not see any good reason not to use it.


The reasons why I for one do not plan to use git are:

- disk space
- bandwidth (rsync traffic has to go through our masquerader, and the
amount of traffic through the masquerader I'm allowed to
generate is limited)
- I do not need Linus' tree for anything.
I'm working against -mm because it's further in development.


Having said this, Andrew might perhaps be able to _additionally_ provide
-mm patches without linus.patch for the convenience of git users.


> Ed Tomlinson

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-05-01 13:30:50

by Adrian Bunk

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, May 01, 2005 at 09:09:37AM -0400, Ed Tomlinson wrote:
>...
> Actually you can look at this either way. Consider, you ask someone to test mm and
> they have not built a kernel before. So they have to:
>
> download a base kernel, untar it.
> download a RCx patch and apply it
> download the mm patch and apply it
> take their current /proc/config.gz and place it in the current dir as .config
> make oldconfig
> make and install the kernel
>
> using cogito in a few weeks this will translate to
>
> install a distro package for cogito, which will probably give you the option of downloading the kernel.
> export an RCx directory treedownload the mm patch and apply it
> take their current /proc/config.gz and place it in the current dir as .config
> make oldconfig
> make and install the kernel
>
> Which is a simpler process... Its just different.
>...


How much bandwith does this require?

Currently, 2.6.12-rc3-mm1 requires 3.7 MB for the -rc3 patch (which can
be used for several -mm patches) plus 2.6 MB for the -mm patch.

The 47 MB download for 2.6.11 are required only once for the many -mm
kernels between 2.6.11 and 2.6.12.

Looking at these numbers, the average download required for every -mm
kernel is currently far below 10 MB.


> Ed Tomlinson

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2005-05-01 16:43:57

by Daniele Venzano

[permalink] [raw]
Subject: Re: [-mm patch] SIS900 must select MII

On 30/apr/05, at 13:52, Adrian Bunk wrote:

> This patch fixes the following compile error caused by bk-netdev:
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>
Signed-off-by: Daniele Venzano <[email protected]>


> --- linux-2.6.12-rc3-mm1/drivers/net/Kconfig.old 2005-04-30
> 13:47:25.000000000 +0200
> +++ linux-2.6.12-rc3-mm1/drivers/net/Kconfig 2005-04-30
> 13:47:48.000000000 +0200
> @@ -1543,8 +1543,9 @@
> config SIS900
> tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
> depends on NET_PCI && PCI
> select CRC32
> + select MII
> ---help---
> This is a driver for the Fast Ethernet PCI network cards based on
> the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded
> in
> SiS 630 and SiS 540 chipsets. If you have one of those, say Y and
>
>
--
Daniele Venzano
http://www.brownhat.org

2005-05-02 15:29:37

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, 01 May 2005 15:30:40 +0200, Adrian Bunk said:

> How much bandwith does this require?
>
> Currently, 2.6.12-rc3-mm1 requires 3.7 MB for the -rc3 patch (which can
> be used for several -mm patches) plus 2.6 MB for the -mm patch.
>
> The 47 MB download for 2.6.11 are required only once for the many -mm
> kernels between 2.6.11 and 2.6.12.
>
> Looking at these numbers, the average download required for every -mm
> kernel is currently far below 10 MB.

And even *more* importantly, note that when downloading a -mm or -rc3 patch,
there's minimal server overhead - it opens *one* file and streams it to the
FTP connection. sendfile() anybody? ;)

How many open/close/etc are needed to sync up 2 'git' mirrors? I don't care *how*
stupendous git/mercurial/whatever are, they're going to have a *really* hard time
getting down to the overhead of an FTP session sending a .bz2 file.

Unless of course, there's only me and a dozen other people even *trying* -mm
kernels and the distinction is lost in the noise... (Out of curiosity, how
many downloads *DO* the -mm kernels get? I know Linus and Andrew want more
testing.. let's keep that in mind here.. ;)


Attachments:
(No filename) (226.00 B)

2005-05-02 15:53:29

by Randy.Dunlap

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Mon, 02 May 2005 11:28:05 -0400 [email protected] wrote:

| On Sun, 01 May 2005 15:30:40 +0200, Adrian Bunk said:
|
| > How much bandwith does this require?
| >
| > Currently, 2.6.12-rc3-mm1 requires 3.7 MB for the -rc3 patch (which can
| > be used for several -mm patches) plus 2.6 MB for the -mm patch.
| >
| > The 47 MB download for 2.6.11 are required only once for the many -mm
| > kernels between 2.6.11 and 2.6.12.
| >
| > Looking at these numbers, the average download required for every -mm
| > kernel is currently far below 10 MB.
|
| And even *more* importantly, note that when downloading a -mm or -rc3 patch,
| there's minimal server overhead - it opens *one* file and streams it to the
| FTP connection. sendfile() anybody? ;)
|
| How many open/close/etc are needed to sync up 2 'git' mirrors? I don't care *how*
| stupendous git/mercurial/whatever are, they're going to have a *really* hard time
| getting down to the overhead of an FTP session sending a .bz2 file.
|
| Unless of course, there's only me and a dozen other people even *trying* -mm
| kernels and the distinction is lost in the noise... (Out of curiosity, how
| many downloads *DO* the -mm kernels get? I know Linus and Andrew want more
| testing.. let's keep that in mind here.. ;)

Last I heard, Andrew had access to kernel.org transfer logs,
but the problem is that we can't tell anything about the download
counts from mirrors.

---
~Randy

2005-05-02 16:29:15

by Valdis Klētnieks

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Mon, 02 May 2005 08:49:30 PDT, "Randy.Dunlap" said:

> Last I heard, Andrew had access to kernel.org transfer logs,
> but the problem is that we can't tell anything about the download
> counts from mirrors.

Have to admit, I'm always hitting the kernel.org one, because that's the
URL that Andrew puts in the announcements. Probably a lot of others do
so as well - so figure if half the people bother using a mirror rather
than just going clicky-click, the kernel.org logs will reflect the other
half. Probably not perfect, but probably good enough to tell how many
digits are in the number at least.

(I'll go out on a limb and say "barely 3 digit's worth of downloads")...


Attachments:
(No filename) (226.00 B)

2005-05-02 22:24:15

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

[email protected] wrote:
>
> On Mon, 02 May 2005 08:49:30 PDT, "Randy.Dunlap" said:
>
> > Last I heard, Andrew had access to kernel.org transfer logs,
> > but the problem is that we can't tell anything about the download
> > counts from mirrors.
>
> Have to admit, I'm always hitting the kernel.org one, because that's the
> URL that Andrew puts in the announcements. Probably a lot of others do
> so as well - so figure if half the people bother using a mirror rather
> than just going clicky-click, the kernel.org logs will reflect the other
> half. Probably not perfect, but probably good enough to tell how many
> digits are in the number at least.
>
> (I'll go out on a limb and say "barely 3 digit's worth of downloads")...

More that you'd expect.

2.6.11-mm1.gz and 2.6.11-mm1.bz2 were downloaded from kernel.org from 1729
unique IP addresses using http and from an additional 321 unique IP
addresses using ftp.

The fact that most people bother to alter the URL from ftp: to http:
perhaps means that more people than I expect also bothered to stick the
country code in there too. Who knows...

2005-05-02 22:39:55

by Olivier Galibert

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Mon, May 02, 2005 at 03:20:19PM -0700, Andrew Morton wrote:
> The fact that most people bother to alter the URL from ftp: to http:
> perhaps means that more people than I expect also bothered to stick the
> country code in there too. Who knows...

Just as a data point, for me sticking a .fr in there makes the
download go from 50-60K/s to 2-3M/s. So I suspect a lot of people add
the country code.

OG.

2005-05-02 22:43:50

by Frank Sorenson

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[email protected] wrote:
> And even *more* importantly, note that when downloading a -mm or -rc3 patch,
> there's minimal server overhead - it opens *one* file and streams it to the
> FTP connection. sendfile() anybody? ;)

Also, note that once I've downloaded the single .bz2 file, I can easily
copy or move it to the various computers I'll be compiling and
installing it on. It's much easier to transfer the one file (via USB
memory stick, SCP, CD, etc.) than a whole tree.

Frank
- --
Frank Sorenson - KD7TZK
Systems Manager, Computer Science Department
Brigham Young University
[email protected]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCdqyQaI0dwg4A47wRApg8AJ46iCEvIOO+nhS9gUTMAAWQPjnq6ACfcdc3
OI0v0qRV4PgEFPRwClkVudo=
=cxYG
-----END PGP SIGNATURE-----

2005-05-03 00:38:37

by Randy.Dunlap

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Mon, 2 May 2005 15:20:19 -0700 Andrew Morton wrote:

| [email protected] wrote:
| >
| > On Mon, 02 May 2005 08:49:30 PDT, "Randy.Dunlap" said:
| >
| > > Last I heard, Andrew had access to kernel.org transfer logs,
| > > but the problem is that we can't tell anything about the download
| > > counts from mirrors.
| >
| > Have to admit, I'm always hitting the kernel.org one, because that's the
| > URL that Andrew puts in the announcements. Probably a lot of others do
| > so as well - so figure if half the people bother using a mirror rather
| > than just going clicky-click, the kernel.org logs will reflect the other
| > half. Probably not perfect, but probably good enough to tell how many
| > digits are in the number at least.
| >
| > (I'll go out on a limb and say "barely 3 digit's worth of downloads")...
|
| More that you'd expect.
|
| 2.6.11-mm1.gz and 2.6.11-mm1.bz2 were downloaded from kernel.org from 1729
| unique IP addresses using http and from an additional 321 unique IP
| addresses using ftp.
|
| The fact that most people bother to alter the URL from ftp: to http:
| perhaps means that more people than I expect also bothered to stick the
| country code in there too. Who knows...

Using http: can also happen by going to http://www.kernel.org
and right-clicking on 2.6.xx-rcN-mmM and downloading it via
a browser... (or however the browser du jour does it).

---
~Randy

2005-05-03 09:00:56

by Reuben Farrelly

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Hi Andrew,

Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/
>
> - There's still a bug in the new timer code. If you think you hit it,
> please revert
>
> timers-fixes-improvements-fix.patch then
> timers-fixes-improvements-smp_processor_id-fix.patch then
> timers-fixes-improvements.patch
>
> or, better, fix the bug.

FWIW, I can reproduce this timer bug fairly consistently, by simply
rebooting my cisco router. That means that my linux box has no default
gateway, and hence the networking blows up within about 30s and dies
with a stack trace which has references to timers.

I'll back out those three patches and see if it continues, but hopefully
my little discovery is useful to someone in terms of coming up with a
fix....

Box is an Intel 2.8/SMP

reuben

2005-05-03 09:08:11

by Andrew Morton

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Reuben Farrelly <[email protected]> wrote:
>
> Hi Andrew,
>
> Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/
> >
> > - There's still a bug in the new timer code. If you think you hit it,
> > please revert
> >
> > timers-fixes-improvements-fix.patch then
> > timers-fixes-improvements-smp_processor_id-fix.patch then
> > timers-fixes-improvements.patch
> >
> > or, better, fix the bug.
>
> FWIW, I can reproduce this timer bug fairly consistently, by simply
> rebooting my cisco router. That means that my linux box has no default
> gateway, and hence the networking blows up within about 30s and dies
> with a stack trace which has references to timers.
>
> I'll back out those three patches and see if it continues, but hopefully
> my little discovery is useful to someone in terms of coming up with a
> fix....
>

Rather than backing things out, please add this instead:


From: Oleg Nesterov <[email protected]>

The bug was identified by Maneesh Soni.

When __mod_timer() changes timer's base it waits for the completion of
timer->function. It is just stupid: the caller of __mod_timer() can held
locks which would prevent completion of the timer's handler.

Solution: do not change the base of the currently running timer.

Side effect: __mod_timer() doesn't garantees anymore that timer will run on
the local cpu.

Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

kernel/timer.c | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)

diff -puN kernel/timer.c~timers-fix-__mod_timer-vs-__run_timers-deadlock kernel/timer.c
--- 25/kernel/timer.c~timers-fix-__mod_timer-vs-__run_timers-deadlock 2005-05-01 02:20:28.415889280 -0700
+++ 25-akpm/kernel/timer.c 2005-05-01 02:20:28.420888520 -0700
@@ -211,41 +211,39 @@ int __mod_timer(struct timer_list *timer
timer_base_t *base;
tvec_base_t *new_base;
unsigned long flags;
- int ret = -1;
+ int ret;

BUG_ON(!timer->function);
check_timer(timer);

- do {
- base = lock_timer_base(timer, &flags);
- new_base = &__get_cpu_var(tvec_bases);
+ base = lock_timer_base(timer, &flags);

- /* Ensure the timer is serialized. */
- if (base != &new_base->t_base
- && base->running_timer == timer)
- goto unlock;
+ ret = 0;
+ if (timer_pending(timer)) {
+ detach_timer(timer, 0);
+ ret = 1;
+ }

- ret = 0;
- if (timer_pending(timer)) {
- detach_timer(timer, 0);
- ret = 1;
- }
+ new_base = &__get_cpu_var(tvec_bases);

- if (base != &new_base->t_base) {
+ if (base != &new_base->t_base) {
+ if (unlikely(base->running_timer == timer))
+ /* Don't change timer's base while it is running.
+ * Needed for serialization of timer wrt itself. */
+ new_base = container_of(base, tvec_base_t, t_base);
+ else {
timer->base = NULL;
/* Safe: the timer can't be seen via ->entry,
* and lock_timer_base checks ->base != 0. */
spin_unlock(&base->lock);
- base = &new_base->t_base;
- spin_lock(&base->lock);
- timer->base = base;
+ spin_lock(&new_base->t_base.lock);
+ timer->base = &new_base->t_base;
}
+ }

- timer->expires = expires;
- internal_add_timer(new_base, timer);
-unlock:
- spin_unlock_irqrestore(&base->lock, flags);
- } while (ret < 0);
+ timer->expires = expires;
+ internal_add_timer(new_base, timer);
+ spin_unlock_irqrestore(&new_base->t_base.lock, flags);

return ret;
}
_



2005-05-03 09:49:11

by Reuben Farrelly

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Hi,

Andrew Morton wrote:
> Reuben Farrelly <[email protected]> wrote:
>
>>Hi Andrew,
>>
>>Andrew Morton wrote:
>>
>>>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm1/
>>>
>>>- There's still a bug in the new timer code. If you think you hit it,
>>> please revert
>>>
>>> timers-fixes-improvements-fix.patch then
>>> timers-fixes-improvements-smp_processor_id-fix.patch then
>>> timers-fixes-improvements.patch
>>>
>>> or, better, fix the bug.
>>
>>FWIW, I can reproduce this timer bug fairly consistently, by simply
>>rebooting my cisco router. That means that my linux box has no default
>>gateway, and hence the networking blows up within about 30s and dies
>>with a stack trace which has references to timers.
>>
>>I'll back out those three patches and see if it continues, but hopefully
>>my little discovery is useful to someone in terms of coming up with a
>>fix....
>>
>
>
> Rather than backing things out, please add this instead:
>
>
> From: Oleg Nesterov <[email protected]>
>
> The bug was identified by Maneesh Soni.

Yup, this patch seems to fix it. I did 3 router reboots, and my linux
box held up fine. Previous to this patch it had fatally oopsed 5 out of
the 6 times I reloaded the router..

Thanks :)

reuben

2005-05-03 16:25:31

by Bill Davidsen

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

Frank Sorenson wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> [email protected] wrote:
>
>>And even *more* importantly, note that when downloading a -mm or -rc3 patch,
>>there's minimal server overhead - it opens *one* file and streams it to the
>>FTP connection. sendfile() anybody? ;)
>
>
> Also, note that once I've downloaded the single .bz2 file, I can easily
> copy or move it to the various computers I'll be compiling and
> installing it on. It's much easier to transfer the one file (via USB
> memory stick, SCP, CD, etc.) than a whole tree.

Is someone really suggesting that SCC will replace the current tar and
patch files? I think it is more a question of "what will replace bk long
term" than what will be the one and only tool. None of the SCC systems
is going to replace the single file source and patch, they don't server
the same purpose.

--
-bill davidsen ([email protected])
"The secret to procrastination is to put things off until the
last possible moment - but no longer" -me

2005-05-08 03:59:01

by Shaohua Li

[permalink] [raw]
Subject: Re: 2.6.12-rc3-mm1

On Sun, 2005-05-01 at 03:46, Andrew Morton wrote:
> Thanks, guys. I seem to have it limping along on UP now, partly with the
> below.
>
> Li, it's a bit awkward to be calling things by hand on SMP and with an
> initcall on UP. Maybe something neater can be done there.
Andrew, how about below one?

Thanks,
Shaohua



---

linux-2.6.11-root/arch/i386/kernel/cpu/common.c | 3 +++
linux-2.6.11-root/arch/i386/kernel/smpboot.c | 5 -----
linux-2.6.11-root/arch/i386/kernel/sysenter.c | 10 ----------
linux-2.6.11-root/arch/i386/mach-voyager/voyager_smp.c | 4 ----
linux-2.6.11-root/include/asm-i386/processor.h | 1 +
linux-2.6.11-root/include/asm-i386/smp.h | 2 --
6 files changed, 4 insertions(+), 21 deletions(-)

diff -puN arch/i386/kernel/sysenter.c~sep_init_cleanup arch/i386/kernel/sysenter.c
--- linux-2.6.11/arch/i386/kernel/sysenter.c~sep_init_cleanup 2005-05-08 10:50:05.266387824 +0800
+++ linux-2.6.11-root/arch/i386/kernel/sysenter.c 2005-05-08 11:12:05.610664984 +0800
@@ -65,13 +65,3 @@ int __init sysenter_setup(void)

return 0;
}
-
-#ifndef CONFIG_SMP
-static int __init sysenter_sep_setup(void)
-{
- sysenter_setup();
- enable_sep_cpu();
- return 0;
-}
-module_init(sysenter_sep_setup);
-#endif
diff -puN arch/i386/kernel/cpu/common.c~sep_init_cleanup arch/i386/kernel/cpu/common.c
--- linux-2.6.11/arch/i386/kernel/cpu/common.c~sep_init_cleanup 2005-05-08 10:50:05.268387520 +0800
+++ linux-2.6.11-root/arch/i386/kernel/cpu/common.c 2005-05-08 10:50:05.275386456 +0800
@@ -428,6 +428,9 @@ void __devinit identify_cpu(struct cpuin
#ifdef CONFIG_X86_MCE
machine_check_init(c);
#endif
+ if (c == &boot_cpu_data)
+ sysenter_setup();
+ enable_sep_cpu();
}

#ifdef CONFIG_X86_HT
diff -puN arch/i386/kernel/smpboot.c~sep_init_cleanup arch/i386/kernel/smpboot.c
--- linux-2.6.11/arch/i386/kernel/smpboot.c~sep_init_cleanup 2005-05-08 10:50:05.269387368 +0800
+++ linux-2.6.11-root/arch/i386/kernel/smpboot.c 2005-05-08 10:50:05.275386456 +0800
@@ -495,8 +495,6 @@ static void __devinit start_secondary(vo
set_cpu_sibling_map(_smp_processor_id());
wmb();

- /* Note: this must be done before __cpu_up finish */
- enable_sep_cpu();
cpu_set(smp_processor_id(), cpu_online_map);

/* We can take interrupts now: we're officially "up". */
@@ -1079,9 +1077,6 @@ static void __init smp_boot_cpus(unsigne
cpus_clear(cpu_core_map[0]);
cpu_set(0, cpu_core_map[0]);

- sysenter_setup();
- enable_sep_cpu();
-
/*
* If we couldn't find an SMP configuration at boot time,
* get out of here now!
diff -puN arch/i386/mach-voyager/voyager_smp.c~sep_init_cleanup arch/i386/mach-voyager/voyager_smp.c
--- linux-2.6.11/arch/i386/mach-voyager/voyager_smp.c~sep_init_cleanup 2005-05-08 10:50:05.271387064 +0800
+++ linux-2.6.11-root/arch/i386/mach-voyager/voyager_smp.c 2005-05-08 10:50:05.276386304 +0800
@@ -499,7 +499,6 @@ start_secondary(void *unused)
while (!cpu_isset(cpuid, smp_commenced_mask))
rep_nop();
local_irq_enable();
- enable_sep_cpu();

local_flush_tlb();

@@ -697,9 +696,6 @@ smp_boot_cpus(void)
printk("CPU%d: ", boot_cpu_id);
print_cpu_info(&cpu_data[boot_cpu_id]);

- sysenter_setup();
- enable_sep_cpu();
-
if(is_cpu_quad()) {
/* booting on a Quad CPU */
printk("VOYAGER SMP: Boot CPU is Quad\n");
diff -puN include/asm-i386/smp.h~sep_init_cleanup include/asm-i386/smp.h
--- linux-2.6.11/include/asm-i386/smp.h~sep_init_cleanup 2005-05-08 11:12:29.334058480 +0800
+++ linux-2.6.11-root/include/asm-i386/smp.h 2005-05-08 11:12:42.703026088 +0800
@@ -37,8 +37,6 @@ extern int smp_num_siblings;
extern cpumask_t cpu_sibling_map[];
extern cpumask_t cpu_core_map[];

-extern int sysenter_setup(void);
-
extern void smp_flush_tlb(void);
extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
extern void smp_invalidate_rcv(void); /* Process an NMI */
diff -puN include/asm-i386/processor.h~sep_init_cleanup include/asm-i386/processor.h
--- linux-2.6.11/include/asm-i386/processor.h~sep_init_cleanup 2005-05-08 11:12:51.875631640 +0800
+++ linux-2.6.11-root/include/asm-i386/processor.h 2005-05-08 11:13:22.290007952 +0800
@@ -694,5 +694,6 @@ extern void select_idle_routine(const st

extern unsigned long boot_option_idle_override;
extern void enable_sep_cpu(void);
+extern int sysenter_setup(void);

#endif /* __ASM_I386_PROCESSOR_H */
_


2005-05-15 22:24:29

by Jeff Garzik

[permalink] [raw]