ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/
- UML updates
- fbdev updates
- nfs4 server updates
- new megaraid driver, new iscsi driver, fatfs update, fbdev updates,
kitchen sink.
- The below description of what has been added and what has been merged is
probably a bit more inaccurate than usual due to my having shuffled things
around and confusing myself.
- I dropped the list-of-all-patches from this email due to it being rather
long. The unexpurgated version is at
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/announce.txt
Changes since 2.6.11-mm1:
linus.patch
bk-acpi.patch
bk-alsa.patch
bk-audit.patch
bk-cifs.patch
bk-cpufreq.patch
bk-driver-core.patch
bk-drm.patch
bk-drm-via.patch
bk-ide-dev.patch
bk-ieee1394.patch
bk-input.patch
bk-kbuild.patch
bk-kconfig.patch
bk-netdev.patch
bk-ntfs.patch
bk-scsi.patch
bk-usb.patch
bk-watchdog.patch
Latest versions of subsystem trees
-dv1394-ioctl-retval-fix.patch
-nfsd--sgi-921857-find-broken-with-nohide-on-nfsv3.patch
-nfsd--exportfs-reduce-stack-usage.patch
-nfsd--svcrpc-add-a-per-flavor-set_client-method.patch
-nfsd--svcrpc-rename-pg_authenticate.patch
-nfsd--svcrpc-move-export-table-checks-to-a-per-program-pg_add_client-method.patch
-nfsd--nfs4-use-new-pg_set_client-method-to-simplify-nfs4-callback-authentication.patch
-nfsd--lockd-dont-try-to-match-callback-requests-against-export-table.patch
-aoe-fix-printk-warning-sparc64.patch
-audit-mips-fix.patch
-ib-simplify-mad-code.patch
-ib-fix-vendor-mad-deregistration.patch
-ib-sparse-fixes.patch
-ib-mthca-add-missing-break.patch
-ib-mthca-fix-reset-value-endianness.patch
-ib-ipoib-fix-rx-memory-leak.patch
-ib-ipoib-use-list_for_each_entry_safe-when-required.patch
-ib-ipoib-rename-global-symbols.patch
-ib-ipoib-small-fixes.patch
-ib-ipoib-dont-call-ipoib_put_ah-with-lock-held.patch
-ib-ipoib-fix-locking-on-path-deletion.patch
-ib-fix-ib_find_cached_gid-port-numbering.patch
-ib-mthca-cq-minor-tweaks.patch
-ib-mthca-improve-cq-locking-part-1.patch
-ib-mthca-improve-cq-locking-part-2.patch
-ib-mthca-cq-cleanups.patch
-ib-remove-unsignaled-receives.patch
-ib-mthca-map-registers-for-mem-free-mode.patch
-ib-mthca-add-uar-allocation.patch
-ib-mthca-dynamic-context-memory-mapping-for-mem-free-mode.patch
-ib-mthca-mem-free-memory-region-support.patch
-ib-mthca-mem-free-eq-initialization.patch
-ib-mthca-mem-free-interrupt-handling.patch
-ib-mthca-tweak-firmware-command-debug-messages.patch
-ib-mthca-tweak-map_icm_page-firmware-command.patch
-ib-mthca-mem-free-doorbell-record-allocation.patch
-ib-mthca-mem-free-doorbell-record-writing.patch
-ib-mthca-refactor-cq-buffer-allocate-free.patch
-ib-mthca-mem-free-cq-initialization.patch
-ib-mthca-mem-free-cq-operations.patch
-ib-mthca-mem-free-qp-initialization.patch
-ib-mthca-mem-free-address-vectors.patch
-ib-mthca-mem-free-work-request-posting.patch
-ib-mthca-mem-free-multicast-table.patch
-ib-mthca-qp-locking-optimization.patch
-ib-mthca-implement-query-of-device-caps.patch
-ib-mad-cancel-callbacks-from-thread.patch
-initialize-spin-locks.patch
-nfsd--nfsd-remove-pg_authenticate-field.patch
-nfsd--global-static-cleanups-for-nfsd.patch
-nfsd--change-nfsd-reply-cache-to-use-listh-lists.patch
-nfsd-discard-cache_hashed-flag-keeping-information-in-refcount-instead.patch
-preliminary-w83627ehf-hardware-monitoring-driver.patch
-i2c-chips-add-adt7461-support-to-lm90-driver.patch
-i2c-chips-ds1337-rtc-driver.patch
-snd_trident_gameport_trigger-warning-fix.patch
-6300esb-watchdog-driver.patch
-randomisation-global-sysctl.patch
-randomisation-global-sysctl-fix.patch
-randomisation-infrastructure.patch
-fix-compilation-of-uml-after-the-stack-randomization-patches.patch
-randomisation-add-pf_randomize.patch
-randomisation-stack-randomisation.patch
-randomisation-mmap-randomisation.patch
-randomisation-enable-by-default.patch
-randomisation-addr_no_randomize-personality.patch
-randomisation-top-of-stack-randomization.patch
-move-accounting-function-calls-out-of-critical-vm-code-pathspatch.patch
-invalidate-range-of-pages-after-direct-io-write.patch
-write-and-wait-on-range-before-direct-io-read.patch
-only-unmap-what-intersects-a-direct_io-op.patch
-make-tree_lock-an-rwlock.patch
-ppc-ppc64-abstract-cpu_feature-checks.patch
-ppc32-dont-create-tmp_gas_check.patch
-ppc32-fix-mv64x60-register-relocation-bug-in-bootwrapper.patch
-ppc32-update-arch-ppc-configs-pmac_defconfig.patch
-ppc32-artesyn-katana-platform-update.patch
-ppc32-artesyn-katana-enet-update.patch
-ppc32-move-irq_descstatus-irq_level-bit-setup-to-xilinx_picc.patch
-ppc32-lindentify-ppc4xx-pic-driver.patch
-ppc32-ppc4xx-pic-ack-parent-uic-in-disable_irq.patch
-ppc32-incorrect-define-in-include-asm-ppc-cpm2h.patch
-ppc32-bogus-definition-of-__cmpxchg_u32.patch
-ppc32-fix-whitespace-for-85xx-cds-common-platform.patch
-ppc32-move-from-using-define-svr_-to-cur_ppc_sys_spec-name.patch
-ppc32-mv64360_pic-non-zero-irq-base.patch
-ppc32-add-gpio-irq-definitions-for-mv64x60-parts.patch
-ppc32-support-openbios-u-boot-for-ebony.patch
-ppc32-add-support-for-the-dallas-1553-rtc-nvram.patch
-ppc32-add-support-to-use-the-ds1553-rtc-nvram-on-mpc8555.patch
-ppc32-trivial-bug-fix-in-critical_exception-macro.patch
-ppc64-remove-unneeded-includes-from-pseries_nvramc.patch
-ppc64-collect-and-export-low-level-cpu-usage-statistics.patch
-ppc64-move-systemcfg-out-of-heads.patch
-ppc64-defconfig-updates.patch
-ppc64-distribute-export_symbols.patch
-ppc64-implement-a-vdso-and-use-it-for-signal-trampoline.patch
-ppc64-implement-a-vdso-and-use-it-for-signal-trampoline-gas-workaround.patch
-ppc64-generic-hotplug-cpu-support.patch
-ppc64-generic-hotplug-cpu-support-fix.patch
-ppc64-disable-hmt-for-rs64-cpus.patch
-use-vmlinux-during-make-install-on-ppc64.patch
-ppc64-functions-to-reserve-performance-monitor-hardware.patch
-ppc64-fix-thinko-in-prom_initc.patch
-ppc64-fix-zimage-wrapper-incorrect-size-to-flush_cache.patch
-ppc64-offb-remapped-address.patch
-mips-add-tanbac-tb0219-base-board-driver.patch
-mips-calculate-clock-at-any-time.patch
-mips-update-cmu.patch
-remove-dead-cyrix-centaur-mtrr-init-code.patch
-uml-trivial-removal-of-makefile-var.patch
-cancel_rearming_delayed_work.patch
-ipvs-deadlock-fix.patch
Merged
+md-fix-typo-in-super_1_sync.patch
RAID fix
+ppc32-trivial-fix-for-e500-oprofile-build.patch
ppc32 build fix
+ppc-raid6-build-fix.patch
ppc32 RAID build fix
+x86_64-pte-warning-fix.patch
x86_64 warning fix
+remove-drivers-char-tpqic02c.patch
Kill dead code
+ppc64-revert-implement-a-vdso-and-use-it-for-signal-trampoline-gas-workaround.patch
Fix ppc64 VDSO code
+sh64-initial-checkstack-port.patch
+sh64-update-richard-curnows-maintainers-info.patch
+sh64-align-slab-caches-on-an-8-byte-boundary.patch
+sh64-defconfig-updates.patch
+sh64-iomap-interface.patch
+sh64-module-support.patch
+sh64-generic-hardirqs.patch
+sh64-ide-updates.patch
+sh64-tmu-init-bugfix.patch
+sh64-send-cli-sti-back-from-whence-it-came.patch
+sh64-beat-dcache-disabling-back-into-submission.patch
+sh64-merge-updates.patch
+sh-defconfig-updates.patch
+sh-generic-hardirqs.patch
+sh-hp620-updates.patch
+sh-framebuffer-updates.patch
+sh-update-cpufreq-driver-for-cpumask.patch
+sh-merge-updates.patch
sh/sh64 updates
+support-hpet-with-a-single-timer-for-system-time.patch
HPET fix
+remove-dead-cyrix-centaur-mtrr-init-code.patch
Cleanup
+swsusp-do-not-use-higher-order-memory-allocations-on-suspend.patch
swsusp memory management fix
+update-suspend-to-ram-vs-video-documentation.patch
swsusp docs
+swsusp-fails-to-suspend-if-config_debug_pagealloc-is-also-enabled.patch
swsusp runtime warning
+kconfig-debug_pagealloc-and-software_suspend-are-incompatible-on-i386.patch
swsusp Kconfig fix
+arm-rtc-build-fix.patch
ARM build fix
+xscale-8250-patches-cause-malfunction-on-amd-8111.patch
8250 fix
+acpi-toshiba-failure-handling.patch
ACPI fix
+include-linux-soundcardh-endianness-fix.patch
Fix oss drivers on big-endian hardware
+ide-serverworks-fix-section-references.patch
IDE sectioning fix
+implement-compat_ioctl-for-joydev.patch
input driver compat support
+psmouse-warning-fix.patch
+sound-pci-cs4281c-fix-typos-in-the-support_joystick=n-case.patch
input driver fixlets
+uml-make-deb-pkg-build-target-build-a-debian-style-user-mode-linux-package.patch
UML deb packaging fix
+arch-i386-pci-i386c-use-new-for_each_pci_dev-macro.patch
cleanup
+megaraid_sas-announcing-new-module-for.patch
New megaraid SAS driver
+open-iscsi-scsi.patch
+open-iscsi-headers.patch
+open-iscsi-kconfig.patch
+open-iscsi-makefile.patch
+open-iscsi-netlink.patch
+open-iscsi-doc.patch
iSCSI driver
+hw-watchdog-vs-softdog-fix.patch
Don't allow the software watchdog driver to override hardware ones.
+vmalloc-introduce-__vmalloc_area-function.patch
+vmalloc-use-__vmalloc_area-in-arch-arm.patch
+vmalloc-use-__vmalloc_area-in-arch-sparc64.patch
+vmalloc-use-__vmalloc_area-in-arch-x86_64.patch
+vmalloc-use-list-of-pages-instead-of-array-in-vm_struct.patch
vmalloc cleanups
+no-arch-specific-mem_map-init.patch
mem_map initialisation consolidation
-must-fix.patch
Dropped.
-fix-buggy-ieee80211_crypt_-selects.patch
Was wrong.
-x25_create-initializing-socket-data-twice.patch
Was also wrong
+drivers-net-myri_codeh-cleanup.patch
Kill huge all-nulls array
+e100-napi-fixes.patch
Fix e100 NAPI handling
+remove-last_rx-update-from-loopback-device.patch
Speed up the net loop device
+selinux-enhanced-mls-support.patch
+selinux-pass-requested-protection-to-security_file_mmap-mprotect-hooks.patch
SELinux feature work
+ppc64-invert-dma-mapping-routines.patch
ppc64 update
+x86-abstract-discontigmem-setup-fix.patch
Fix x86-abstract-discontigmem-setup.patch
+x86-disable-msi-for-amd-8131.patch
MSI quirk
+x86-64-kconfig-typo-trivial.patch
+x86_64-remove-old-decl-trivial.patch
+x86_64-avoid-panic-lockup.patch
x86_64 updates
-xen-vmm-4-add-ptep_establish_new-to-make-va-available.patch
-xen-vmm-4-return-code-for-arch_free_page.patch
-xen-vmm-4-return-code-for-arch_free_page-fix.patch
-xen-vmm-4-runtime-disable-of-vt-console.patch
-xen-vmm-4-has_arch_dev_mem.patch
-xen-vmm-4-split-free_irq-into-teardown_irq.patch
These hit a lot of rejects, so drop them for now.
+uml-2611-updates.patch
+uml-update-defconfig.patch
+uml-slirp-driver-tells-the-network-its-not-ethernet.patch
+uml-get-rid-of-uneccessary-hostfs-build-trick.patch
+uml-fix-some-usercopy-confusion.patch
+uml-make-the-ubd-driver-recognize-letters-in-device-names.patch
+uml-fix-a-shutdown-hang-caused-by-a-failed-ifconfig.patch
+uml-code-cleanup.patch
+uml-clean-up-the-syscall-path.patch
+uml-make-syscall-debugging-code-configurable.patch
+uml-add-a-comment-explaining-pread-availability.patch
+uml-remove-useless-sys_mount-wrapper.patch
+uml-remove-mm_indirect-reference-in-modify_ldt.patch
+uml-fix-a-compile-failure.patch
+uml-improve-error-reporting.patch
+uml-make-a-bunch-of-driver-functions-static.patch
UML update
-poll-mini-optimisations.patch
Dropped - the poll code is tricky and this optimisation is small and the
patch made subtle user-visible changes.
+blockdev-fixes-race-between-mount-umount.patch
+blockdev-fixes-race-between-mount-umount-tidy.patch
umount race fix
+invalidate_inode_pages2_range-livelock-fix.patch
Avoid a livelock in direct-io pagecache invalidation
+add-and-use-compat_sigev_pad_size.patch
+consolidate-the-last-compat-sigvals.patch
+consolidate-the-last-of-the-compat-sigevent-structs.patch
compat layer updates
+cx24110-conexant-frontend-update.patch
+cx24110-conexant-frontend-update-tidy.patch
linuxtv driver fixes
+direct-io-async-short-read-fix.patch
+direct-io-async-short-read-fix-fix.patch
Fix strange AIO-DIO read() behaviour
+nice-and-rt-prio-rlimits.patch
rlimits for niceness and rt-policy.
+del_timer_sync-scalability-patch.patch
+del_timer_sync-scalability-patch-tidy.patch
Speed up del_timer_sync()
inotify.patch
+inotify-fix.patch
New inotify code drop
+ext3-jbd-race-releasing-in-use-journal_heads.patch
JBD race fix
+ext3-writepages-support-for-writeback-mode.patch
Use writepages() for ext3 data=writeback mode
+nfsd4-remove-utf8-checking.patch
+nfsd4-create-a-slab-cache-for-stateowners.patch
+nfsd4-remove-stateowner-debug-counters.patch
+nfsd4-fix-oops-on-nfsd4-shutdown.patch
+nfsd4-cbnull-refcount-leak.patch
+nfsd4-reclaim-cleanup.patch
+nfsd4-move-special-stateid-processing.patch
+nfsd4-allow-some-reads-and-writes-during-the-grace-period.patch
+nfsd4-use-existing-open-instead-of-reopening-on-read-and-write.patch
+nfsd4-miscellaneous-open-cleanup.patch
+nfsd4-miscellaneous-open-cleanup-2.patch
+nfsd4-miscellaneous-open-cleanup-3.patch
+nfsd4-dont-release-nfs4_file-with-associated-delegations.patch
+nfsd4-do-callback-replays-by-hand.patch
+nfsd4-simplify-open_delegation.patch
+nfsd4-simplify-open_delegation-2.patch
+nfsd4-miscellaneous-delegation-fixes.patch
+nfsd4-remove-unnecessary-check-in-find_delegation_stateid.patch
+nfsd4-fix-nfs4_check_delegmode.patch
+nfsd4-simplify-clientid-hash-table-searches.patch
+nfsd4-simplify-verify_clientid.patch
+nfsd4-dont-allow-unconfirmed-renew.patch
+nfsd4-provide-no_cb_path-error-on-renew.patch
+nfsd4-simplify-find_openstateowner_str.patch
+nfsd4-simplify-find-functions.patch
+nfsd4-return-callback_ident-in-callbacks.patch
+nfsd4-remove-incorrect-kfree-from-callback.patch
+nfsd4-make-nfsd4_cb_recall-return-void.patch
+nfsd4-fix-callback-cred-refcnt-leak.patch
+nfsd4-use-sync-rpc-for-delegation-recall.patch
+nfsd4-trivial-callback-cleanup.patch
+nfsd4-nfs4_cb_recall-cleanup.patch
+nfsd4-remove-dl_recall_cnt.patch
+nfsd4-rename-release_stateid_lockowner.patch
+nfsd4-keep-lockowners-off-perclient-list.patch
+nfsd4-fix-laundromat-delegation-reaping.patch
+nfsd4-remove-st_vfs_set.patch
+nfsd4-remove-st_vfs_file-checks.patch
+nfsd4-fix-cb-race.patch
+nfsd4-fix-delegation-refcounting.patch
+nfsd4-reorganize-release_deleg.patch
+nfsd4-store-file-with-deleg.patch
+nfsd4-fix-delegation-filp-sharing.patch
+nfsd4-fix-sleep-under-spinlock.patch
+nfsd4-allow-io-to-use-deleg-stateid-file.patch
+nfsd4-remove-dl_state.patch
+nfsd4-fix-delegation-refcount-leak.patch
+nfsd4-fix_release_state_owner-prototype.patch
+locks-remove-unnecessary-bug.patch
+nfsd4-move-delegation-decisions-to-lock_manager-callbacks.patch
+nfsd4-eliminate-unnecessary-remove_lease.patch
+replace-schedule_timeout-with-msleep.patch
kernel nfs4 server update
+fat-fix-writev-add-aio-support.patch
+fat-updated-fat-attributes-patch.patch
+fat-fat_readdirx-with-dotok=yes-fix.patch
+let-fat-handle-ms_synchronous-flag.patch
+fat-rewrite-the-fat-file-allocation-table-access.patch
+fat-add-debugging-code-to-fatentc.patch
+fat-use-unsigned-int-for-free_clusters-and.patch
+fat-struct-vfat_slot_info-cleanup.patch
+fat-use-struct-fat_slot_info-for-fat_search_long.patch
+fat-add-fat_remove_entries.patch
+fat-fat_build_inode-cleanup.patch
+fat-use-struct-fat_slot_info-for-fat_scan.patch
+fat-use-struct-fat_slot_info-for-msdos_find.patch
+fat-vfat_build_slots-cleanup.patch
+fat-use-a-same-timestamp-on-some-operations-path.patch
+fat-msdos_rename-cleanup.patch
+fat-msdos_add_entry-cleanup.patch
+fat-allocate-the-cluster-before-adding-the-directory.patch
+fat-rewrite-fat_add_entries.patch
+fat-use-fat_remove_entries-for-msdos.patch
+fat-make-the-fat_get_entry-fat__get_entry-the.patch
+fat-i_pos-cleanup.patch
+fat-remove-the-multiple-msdos_sb-call.patch
+fat-remove-unneed-mark_inode_dirty.patch
+fat-fix-fat_truncate.patch
+fat-fix-fat_write_inode.patch
+fat-use-synchronous-update-for.patch
+fat-update-rename-path.patch
+fat-fix-typo.patch
fatfs update: `mount -o sync' support.
+fscache-menuconfig-help-fix-documentation-path.patch
Kconfig hlpe fix
+geodefb-add-geode-framebuffer-driver-sparc-fix.patch
Fix geodefb-add-geode-framebuffer-driver.patch on sparc
+fbdev-add-mode-changing-via-sysfs.patch
+fbdev-capture-modelist-change-event.patch
+fbcon-cursor-fixes.patch
+rivafb-fix-i2c-error-handling.patch
+nvidiafb-fix-i2c-error-handling.patch
+nvidiafb-some-chipsets-need-a-buffer-pitch-divisible-by-64.patch
+fbdev-generic-drawing-function-cleanups-2.patch
+fbdev-allow-core-fb-to-be-built-as-a-module.patch
+fbdev-allow-core-fb-to-be-built-as-a-module-fix.patch
+fbdev-allow-core-fb-to-be-built-as-a-module-fix-fix.patch
+savagefb-make-savagefb-one-module.patch
+fbdev-cleanups-in-driver-video.patch
+radeonfb-pll-access-workaround.patch
framebuffer driver updates
+md-erroneous-sizeof-use-in-raid1.patch
+md-raid1-support-for-bitmap-intent-logging-fix.patch
+md-fix-deadlock-due-to-md-thread-processing-delayed-requests.patch
Fixes to md patches in -mm.
+verify_area-cleanup-sound-fix.patch
Fix verify_area-cleanup-sound.patch
+verify_area-cleanup-deprecate-fix.patch
Fix verify_area-cleanup-deprecate.patch
+arch_alpha_kernel_osf_sys-tiny-cleanup-retvalpatch.patch
+arch_alpha_kernel_osf_sys-tiny-cleanup-retvalpatch-fix.patch
+fs_compat-tiny-cleanup-retvalpatch.patch
+arch_mips_kernel_irixsig-slight-rework-of-irix_sigsendsetpatch.patch
+arch_sparc_kernel_ptrace-pointless-assignment-and-shadowed-varpatch.patch
+verify_area-cleanup-feature-removal-schedulepatch.patch
Various little cleanups
+fuse-device-functions-use-after-free-fix.patch
+fuse-file-operations-use-generic_file_llseek.patch
+fuse-nfs-export-inode-leak-fix.patch
FUSE fixes
+list_for_each_entry-arch-i386-mm-pageattrc.patch
+gus_wavec-vfree-checking-cleanups.patch
+i386-traps-replace-schedule_timeout-with-ssleep.patch
+radio-sf16fmi-cleanup.patch
+unified-spinlock-initialization-include-linux-waith.patch
+scripts-mod-sumversionc-replace-strtok-with-strsep.patch
+char-snsc-reorder-set_current_state-and-add_wait_queue.patch
+char-hvsi-use-wait_event_timeout.patch
+char-sx-replace-schedule_timeout-with-msleep_interruptible.patch
+serial-crisv10-replace-schedule_timeout-with-msleep.patch
+ftape-fdc-io-insert-set_current_state-before-schedule_timeout.patch
+tc-zs-replace-schedule_timeout-with-msleep_interruptible.patch
+delete-unused-file-drivers_char_hp600_keybc.patch
+drivers-isdn-tpam-convert-to-pci_register_driver.patch
+drivers-isdn-hardware-avm-convert-to-pci_register_driver.patch
+message-mptbase-replace-schedule_timeout-with-ssleep.patch
+drivers-message-fusion-convert-to-pci_register_driver.patch
+drivers-eisa-convert-to-pci_register_driver.patch
+char-lp-remove-interruptible_sleep_on_timeout-usage.patch
+char-istallion-replace-interruptible_sleep_on-with-wait_event_interruptible.patch
+list_for_each_entry-arch-um-drivers-chan_kernc.patch
+mips-fix-section-type-conflict-about-mpc30x.patch
+macintosh-mediabay-replace-schedule_timeout-with-msleep_interruptible.patch
+drivers-macintoshisdn-convert-to-pci_register_driver.patch
+fix-error-reported-by-nfsd-which-it-gets-etxtbsy.patch
Little code tweaks.
number of patches in -mm: 943
number of changesets in external trees: 738
number of patches in -mm only: 925
total patches: 1663
All 943 patches:
See ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/announce.txt
With the BUG_ON() use in linux/list.h I get this:
CC init/initramfs.o
In file included from include/linux/wait.h:23,
from include/linux/fs.h:205,
from init/initramfs.c:2:
include/linux/list.h: In function `list_del':
include/linux/list.h:164: warning: implicit declaration of function `printk'
In file included from include/linux/spinlock.h:13,
from include/linux/wait.h:25,
from include/linux/fs.h:205,
from init/initramfs.c:2:
include/linux/kernel.h: At top level:
include/linux/kernel.h:116: error: conflicting types for 'printk'
include/linux/kernel.h:116: note: a parameter list with an ellipsis can't match an empty parameter name list declaration
include/linux/list.h:164: error: previous implicit declaration of 'printk' was here
make[1]: *** [init/initramfs.o] Error 1
make: *** [init] Error 2
It looks like this is a result of having asm/bug.h included and not
having linux/kernel.h included before it, as adding that makes this go
away. This seems like it will be a problem for platforms that use
printk() in their BUG() definitions (in the HAVE_ARCH_BUG case) without
dragging in this header from somewhere else.
With this I can build on sh again. The other solution is to add the
include to asm/bug.h directly, but it would be nice to avoid linux/
includes from asm/ context in general..
Thoughts? Or ideas for a more appropriate fix?
--- linux-sh-2.6.11-mm2.orig/include/linux/list.h 2005-03-08 15:46:50.601565604 +0200
+++ linux-sh-2.6.11-mm2/include/linux/list.h 2005-03-08 15:46:53.882114403 +0200
@@ -5,6 +5,7 @@
#include <linux/stddef.h>
#include <linux/prefetch.h>
+#include <linux/kernel.h>
#include <asm/system.h>
#include <asm/bug.h>
Compile Statistics
------------------
Build Tree: mm
Compiler: gcc 3.4.1
Detailed results: http://developer.osdl.org/cherry/compile/
Summary of changes from 2.6.11-mm1
----------------------------------
Defconfig (bzImage): no change
Allnoconfig (bzImage): no change
Allyesconfig (bzImage): +1 warnings
Allyesconfig (modules): no change
Allmodconfig (bzImage): no change
Allmodconfig (modules: +4 warnings
Kernel bzImage bzImage bzImage modules bzImage modules
(defconfig) (allno) (allyes) (allyes) (allmod) (allmod)
--------------- ---------- -------- -------- -------- -------- --------
2.6.11-mm2 12w/0e 0w/0e 190w/0e 6w/0e 16w/0e 177w/0e
2.6.11-mm1 12w/0e 0w/0e 189w/0e 6w/0e 16w/0e 173w/0e
2.6.11-rc5-mm1 21w/0e 0w/0e 262w/0e 10w/0e 26w/0e 238w/0e
2.6.11-rc4-mm1 22w/0e 0w/0e 271w/0e 10w/0e 25w/0e 249w/0e
2.6.11-rc3-mm2 14w/0e 0w/0e 192w/0e 6w/0e 19w/0e 172w/0e
2.6.11-rc3-mm1 13w/10e 0w/7e 196w/12e 6w/0e 18w/12e 177w/0e
2.6.11-rc2-mm2 15w/0e 0w/0e 201w/0e 6w/0e 18w/0e 182w/0e
2.6.11-rc2-mm1 15w/0e 0w/0e 306w/14e 6w/0e 18w/0e 294w/0e
2.6.11-rc1-mm2 21w/0e 0w/0e 316w/9e 6w/0e 22w/0e 294w/0e
2.6.11-rc1-mm1 21w/0e 0w/0e 319w/0e 6w/0e 23w/0e 298w/0e
2.6.10-mm3 21w/0e 0w/0e 320w/0e 6w/0e 23w/0e 299w/0e
2.6.10-mm2 21w/0e 0w/0e 440w/0e 6w/0e 23w/0e 420w/0e
2.6.10-mm1 12w/0e 0w/0e 414w/0e 6w/0e 17w/0e 399w/0e
2.6.10-rc3-mm1 12w/0e 0w/0e 414w/0e 6w/0e 16w/0e 401w/0e
2.6.10-rc2-mm4 15w/0e 1w/7e 421w/0e 6w/0e 16w/0e 408w/0e
2.6.10-rc2-mm3 15w/0e 0w/0e 1255w/12e 66w/0e 16w/0e 1507w/0e
2.6.10-rc2-mm2 15w/0e 0w/0e 1362w/15e 65w/0e 16w/0e 1612w/2e
2.6.10-rc2-mm1 15w/0e 0w/0e 1405w/11e 65w/0e 16w/0e 1652w/0e
2.6.10-rc1-mm5 16w/0e 0w/0e 1587w/0e 65w/0e 20w/0e 1834w/0e
2.6.10-rc1-mm4 16w/0e 0w/0e 1485w/9e 65w/0e 20w/0e 1732w/0e
(Compiles with gcc 3.2.2)
2.6.10-rc1-mm3 7w/31e 0w/9e 496w/141e 4w/0e 4w/50e 693w/83e
2.6.10-rc1-mm2 16w/1e 1w/1e 529w/1e 4w/0e 12w/1e 729w/0e
2.6.10-mm1 12w/0e 0w/0e 414w/0e 6w/0e 17w/0e 399w/0e
2.6.10-rc3-mm1 12w/0e 0w/0e 414w/0e 6w/0e 16w/0e 401w/0e
2.6.10-rc2-mm4 15w/0e 1w/7e 421w/0e 6w/0e 16w/0e 408w/0e
2.6.10-rc2-mm3 15w/0e 0w/0e 1255w/12e 66w/0e 16w/0e 1507w/0e
2.6.10-rc2-mm2 15w/0e 0w/0e 1362w/15e 65w/0e 16w/0e 1612w/2e
2.6.10-rc2-mm1 15w/0e 0w/0e 1405w/11e 65w/0e 16w/0e 1652w/0e
2.6.10-rc1-mm5 16w/0e 0w/0e 1587w/0e 65w/0e 20w/0e 1834w/0e
2.6.10-rc1-mm4 16w/0e 0w/0e 1485w/9e 65w/0e 20w/0e 1732w/0e
(Compiles with gcc 3.2.2)
2.6.10-rc1-mm3 7w/31e 0w/9e 496w/141e 4w/0e 4w/50e 693w/83e
2.6.10-rc1-mm2 16w/1e 1w/1e 529w/1e 4w/0e 12w/1e 729w/0e
2.6.10-rc1-mm1 16w/1e 1w/1e 592w/1e 4w/0e 13w/1e 857w/0e
2.6.9-mm1 6w/1e 1w/1e 1761w/15e 65w/0e 9w/0e 2086w/0e
2.6.9-rc4-mm1 5w/0e 0w/0e 1766w/11e 43w/0e 6w/0e 1798w/0e
2.6.9-rc3-mm3 5w/0e 0w/0e 1756w/11e 43w/0e 4w/0e 1786w/0e
2.6.9-rc3-mm2 10w/0e 4w/9e 1754w/14e 43w/0e 4w/0e 1782w/1e
2.6.9-rc3-mm1 10w/0e 4w/10e 1768w/0e 43w/0e 4w/0e 1796w/0e
2.6.9-rc2-mm4 10w/0e 5w/0e 2573w/0e 41w/0e 4w/0e 2600w/0e
2.6.9-rc2-mm3 10w/0e 5w/0e 2400w/0e 41w/0e 4w/0e 2435w/0e
2.6.9-rc2-mm2 10w/0e 5w/0e 2919w/0e 41w/0e 4w/0e 2954w/0e
2.6.9-rc2-mm1 0w/0e 2w/0e 3541w/9e 41w/0e 3w/9e 3567w/0e
2.6.9-rc1-mm4 0w/0e 1w/0e 55w/0e 3w/0e 2w/0e 48w/0e
2.6.9-rc1-mm3 0w/0e 0w/0e 55w/13e 3w/0e 1w/0e 49w/1e
2.6.9-rc1-mm2 0w/0e 0w/0e 53w/11e 3w/0e 1w/0e 47w/0e
2.6.9-rc1-mm1 0w/0e 0w/0e 80w/0e 4w/0e 1w/0e 74w/0e
2.6.8.1-mm4 0w/0e 0w/0e 78w/0e 4w/0e 1w/0e 73w/0e
2.6.8.1-mm3 0w/96e 0w/0e 78w/97e 4w/0e 1w/0e 74w/89e
2.6.8.1-mm2 0w/96e 0w/0e 78w/97e 4w/0e 1w/0e 74w/89e
2.6.8.1-mm1 0w/0e 0w/0e 78w/0e 4w/0e 1w/0e 74w/0e
2.6.8-rc4-mm1 0w/0e 0w/5e 81w/0e 4w/0e 1w/0e 75w/0e
2.6.8-rc3-mm2 1w/7e 0w/5e 82w/8e 4w/0e 2w/8e 75w/0e
2.6.8-rc3-mm1 0w/0e 1w/5e 81w/9e 4w/0e 1w/0e 75w/0e
2.6.8-rc2-mm2 0w/0e 4w/5e 87w/9e 4w/0e 1w/0e 80w/0e
2.6.8-rc2-mm1 0w/0e 0w/0e 83w/9e 3w/0e 1w/0e 81w/0e
2.6.8-rc1-mm1 0w/0e 0w/0e 88w/9e 5w/0e 1w/0e 87w/0e
2.6.7-mm7 0w/0e 0w/0e 89w/9e 5w/0e 1w/0e 84w/0e
2.6.7-mm6 0w/0e 0w/0e 85w/9e 5w/0e 1w/0e 80w/0e
2.6.7-mm5 0w/0e 0w/0e 92w/0e 5w/0e 1w/0e 87w/0e
2.6.7-mm4 0w/0e 0w/0e 94w/0e 5w/0e 1w/0e 89w/0e
2.6.7-mm3 0w/0e 0w/0e 90w/6e 5w/0e 1w/0e 86w/0e
2.6.7-mm2 0w/0e 0w/0e 109w/0e 7w/0e 1w/0e 106w/0e
2.6.7-mm1 0w/0e 5w/0e 108w/0e 5w/0e 1w/0e 104w/0e
2.6.7-rc3-mm2 0w/0e 5w/0e 105w/10e 5w/0e 2w/0e 100w/2e
2.6.7-rc3-mm1 0w/0e 5w/0e 104w/10e 5w/0e 2w/0e 100w/2e
2.6.7-rc2-mm2 0w/0e 5w/0e 109w/10e 5w/0e 2w/0e 105w/2e
2.6.7-rc2-mm1 0w/0e 12w/0e 158w/13e 5w/0e 3w/0e 153w/4e
2.6.7-rc1-mm1 0w/0e 6w/0e 108w/0e 5w/0e 2w/0e 104w/0e
2.6.6-mm5 0w/0e 0w/0e 109w/5e 5w/0e 2w/0e 110w/0e
2.6.6-mm4 0w/0e 0w/0e 112w/9e 5w/0e 2w/5e 106w/1e
2.6.6-mm3 3w/9e 0w/0e 120w/26e 5w/0e 2w/0e 114w/10e
2.6.6-mm2 4w/11e 0w/0e 120w/24e 6w/0e 2w/0e 118w/9e
2.6.6-mm1 1w/0e 0w/0e 118w/25e 6w/0e 2w/0e 114w/10e
2.6.6-rc3-mm2 0w/0e 0w/0e 117w/ 0e 8w/0e 2w/0e 116w/0e
2.6.6-rc3-mm1 0w/0e 0w/0e 120w/10e 8w/0e 2w/0e 152w/2e
2.6.6-rc2-mm2 0w/0e 1w/5e 118w/ 0e 8w/0e 3w/0e 118w/0e
2.6.6-rc2-mm1 0w/0e 0w/0e 115w/ 0e 7w/0e 3w/0e 116w/0e
2.6.6-rc1-mm1 0w/0e 0w/7e 122w/ 0e 7w/0e 4w/0e 122w/0e
2.6.5-mm6 0w/0e 0w/0e 123w/ 0e 7w/0e 4w/0e 124w/0e
2.6.5-mm5 0w/0e 0w/0e 119w/ 0e 7w/0e 4w/0e 120w/0e
2.6.5-mm4 0w/0e 0w/0e 120w/ 0e 7w/0e 4w/0e 121w/0e
2.6.5-mm3 0w/0e 1w/0e 121w/12e 7w/0e 3w/0e 123w/0e
2.6.5-mm2 0w/0e 0w/0e 128w/12e 7w/0e 3w/0e 134w/0e
2.6.5-mm1 0w/0e 5w/0e 122w/ 0e 7w/0e 3w/0e 124w/0e
2.6.5-rc3-mm4 0w/0e 0w/0e 124w/ 0e 8w/0e 4w/0e 126w/0e
2.6.5-rc3-mm3 0w/0e 5w/0e 129w/14e 8w/0e 4w/0e 129w/6e
2.6.5-rc3-mm2 0w/0e 5w/0e 130w/14e 8w/0e 4w/0e 129w/6e
2.6.5-rc3-mm1 0w/0e 5w/0e 129w/ 0e 8w/0e 4w/0e 129w/0e
2.6.5-rc2-mm5 0w/0e 5w/0e 130w/ 0e 8w/0e 4w/0e 129w/0e
2.6.5-rc2-mm4 0w/0e 5w/0e 134w/ 0e 8w/0e 3w/0e 133w/0e
2.6.5-rc2-mm3 0w/0e 5w/0e 134w/ 0e 8w/0e 3w/0e 133w/0e
2.6.5-rc2-mm2 0w/0e 5w/0e 137w/ 0e 8w/0e 3w/0e 134w/0e
2.6.5-rc2-mm1 0w/0e 5w/0e 136w/ 0e 8w/0e 3w/0e 134w/0e
2.6.5-rc1-mm2 0w/0e 5w/0e 135w/ 5e 8w/0e 3w/0e 133w/0e
2.6.5-rc1-mm1 0w/0e 5w/0e 135w/ 5e 8w/0e 3w/0e 133w/0e
2.6.4-mm2 1w/2e 5w/2e 144w/10e 8w/0e 3w/2e 144w/0e
2.6.4-mm1 1w/0e 5w/0e 146w/ 5e 8w/0e 3w/0e 144w/0e
2.6.4-rc2-mm1 1w/0e 5w/0e 146w/12e 11w/0e 3w/0e 147w/2e
2.6.4-rc1-mm2 1w/0e 5w/0e 144w/ 0e 11w/0e 3w/0e 145w/0e
2.6.4-rc1-mm1 1w/0e 5w/0e 147w/ 5e 11w/0e 3w/0e 147w/0e
2.6.3-mm4 1w/0e 5w/0e 146w/ 0e 7w/0e 3w/0e 142w/0e
2.6.3-mm3 1w/2e 5w/2e 146w/15e 7w/0e 3w/2e 144w/5e
2.6.3-mm2 1w/8e 5w/0e 140w/ 0e 7w/0e 3w/0e 138w/0e
2.6.3-mm1 1w/0e 5w/0e 143w/ 5e 7w/0e 3w/0e 141w/0e
2.6.3-rc3-mm1 1w/0e 0w/0e 144w/13e 7w/0e 3w/0e 142w/3e
2.6.3-rc2-mm1 1w/0e 0w/265e 144w/ 5e 7w/0e 3w/0e 145w/0e
2.6.3-rc1-mm1 1w/0e 0w/265e 141w/ 5e 7w/0e 3w/0e 143w/0e
2.6.2-mm1 2w/0e 0w/264e 147w/ 5e 7w/0e 3w/0e 173w/0e
2.6.2-rc3-mm1 2w/0e 0w/265e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc2-mm2 0w/0e 0w/264e 145w/ 5e 7w/0e 3w/0e 171w/0e
2.6.2-rc2-mm1 0w/0e 0w/264e 146w/ 5e 7w/0e 3w/0e 172w/0e
2.6.2-rc1-mm3 0w/0e 0w/265e 144w/ 8e 7w/0e 3w/0e 169w/0e
2.6.2-rc1-mm2 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.2-rc1-mm1 0w/0e 0w/264e 144w/ 5e 10w/0e 3w/0e 171w/0e
2.6.1-mm5 2w/5e 0w/264e 153w/11e 10w/0e 3w/0e 180w/0e
2.6.1-mm4 0w/821e 0w/264e 154w/ 5e 8w/1e 5w/0e 179w/0e
2.6.1-mm3 0w/0e 0w/0e 151w/ 5e 10w/0e 3w/0e 177w/0e
2.6.1-mm2 0w/0e 0w/0e 143w/ 5e 12w/0e 3w/0e 171w/0e
2.6.1-mm1 0w/0e 0w/0e 146w/ 9e 12w/0e 6w/0e 171w/0e
2.6.1-rc2-mm1 0w/0e 0w/0e 149w/ 0e 12w/0e 6w/0e 171w/4e
2.6.1-rc1-mm2 0w/0e 0w/0e 157w/15e 12w/0e 3w/0e 185w/4e
2.6.1-rc1-mm1 0w/0e 0w/0e 156w/10e 12w/0e 3w/0e 184w/2e
2.6.0-mm2 0w/0e 0w/0e 161w/ 0e 12w/0e 3w/0e 189w/0e
2.6.0-mm1 0w/0e 0w/0e 173w/ 0e 12w/0e 3w/0e 212w/0e
John
mm/fremap.c:33:48: macro "flush_cache_page" passed 3 arguments, but takes just 2
mm/fremap.c: In function `zap_pte':
mm/fremap.c:33: error: `flush_cache_page' undeclared (first use in this function)
mm/fremap.c:33: error: (Each undeclared identifier is reported only once
mm/fremap.c:33: error: for each function it appears in.)
mm/fremap.c:34:55: macro "ptep_get_and_clear" passed 3 arguments, but takes just 1
mm/fremap.c:34: error: `ptep_get_and_clear' undeclared (first use in this function)
mm/fremap.c:48:41: macro "pte_clear" passed 3 arguments, but takes just 1
mm/fremap.c:48: error: `pte_clear' undeclared (first use in this function)
mm/fremap.c: In function `install_page':
mm/fremap.c:97: warning: implicit declaration of function `set_pte_at'
make[1]: *** [mm/fremap.o] Error 1
make: *** [mm] Error 2
The same config worked fine for 2.6.11-mm1:
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_LOCALVERSION=""
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_SYSCTL=y
CONFIG_AUDIT=y
CONFIG_AUDITSYSCALL=y
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
CONFIG_IKCONFIG=y
CONFIG_KALLSYMS=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_BASE_SMALL=0
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
CONFIG_KMOD=y
CONFIG_STOP_MACHINE=y
CONFIG_X86_PC=y
CONFIG_MPENTIUM4=y
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_HPET_EMULATE_RTC=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
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_NONFATAL=y
CONFIG_X86_MCE_P4THERMAL=y
CONFIG_HIGHMEM4G=y
CONFIG_HIGHMEM=y
CONFIG_MTRR=y
CONFIG_IRQBALANCE=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_SECCOMP=y
CONFIG_PHYSICAL_START=0x100000
CONFIG_PM=y
CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y
CONFIG_ACPI_AC=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_VIDEO=m
CONFIG_ACPI_FAN=y
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_IBM=m
CONFIG_ACPI_BLACKLIST_YEAR=0
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_PCI=y
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_LEGACY_PROC=y
CONFIG_PCI_NAMES=y
CONFIG_ISA=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
CONFIG_PARPORT=y
CONFIG_PARPORT_PC=y
CONFIG_PNP=y
CONFIG_PNPACPI=y
CONFIG_BLK_DEV_FD=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_INITRAMFS_SOURCE=""
CONFIG_LBD=y
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_IDE=y
CONFIG_BLK_DEV_IDE=y
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECD=y
CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
CONFIG_BLK_DEV_GENERIC=y
CONFIG_BLK_DEV_IDEDMA_PCI=y
CONFIG_IDEDMA_PCI_AUTO=y
CONFIG_BLK_DEV_HPT366=y
CONFIG_BLK_DEV_PIIX=y
CONFIG_BLK_DEV_PDC202XX_NEW=y
CONFIG_BLK_DEV_IDEDMA=y
CONFIG_IDEDMA_AUTO=y
CONFIG_SCSI=y
CONFIG_SCSI_PROC_FS=y
CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y
CONFIG_SCSI_SPI_ATTRS=y
CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_QLA2XXX=y
CONFIG_MD=y
CONFIG_BLK_DEV_MD=y
CONFIG_MD_LINEAR=y
CONFIG_MD_RAID0=y
CONFIG_MD_RAID1=y
CONFIG_MD_RAID10=y
CONFIG_MD_RAID5=y
CONFIG_MD_RAID6=y
CONFIG_IEEE1394=y
CONFIG_IEEE1394_OHCI1394=y
CONFIG_IEEE1394_RAWIO=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_TCPDIAG=y
CONFIG_IP_TCPDIAG_IPV6=y
CONFIG_IPV6=y
CONFIG_INET6_AH=y
CONFIG_INET6_ESP=y
CONFIG_INET6_IPCOMP=y
CONFIG_INET6_TUNNEL=y
CONFIG_IPV6_TUNNEL=y
CONFIG_NETFILTER=y
CONFIG_IP_NF_CONNTRACK=y
CONFIG_IP_NF_QUEUE=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_LIMIT=y
CONFIG_IP_NF_MATCH_IPRANGE=y
CONFIG_IP_NF_MATCH_MAC=y
CONFIG_IP_NF_MATCH_PKTTYPE=y
CONFIG_IP_NF_MATCH_MARK=y
CONFIG_IP_NF_MATCH_MULTIPORT=y
CONFIG_IP_NF_MATCH_TOS=y
CONFIG_IP_NF_MATCH_RECENT=y
CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_DSCP=y
CONFIG_IP_NF_MATCH_AH_ESP=y
CONFIG_IP_NF_MATCH_LENGTH=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_MATCH_TCPMSS=y
CONFIG_IP_NF_MATCH_HELPER=y
CONFIG_IP_NF_MATCH_STATE=y
CONFIG_IP_NF_MATCH_CONNTRACK=y
CONFIG_IP_NF_MATCH_OWNER=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_TARGET_LOG=y
CONFIG_IP_NF_TARGET_ULOG=y
CONFIG_IP_NF_TARGET_TCPMSS=y
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_SAME=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_TOS=y
CONFIG_IP_NF_TARGET_ECN=y
CONFIG_IP_NF_TARGET_DSCP=y
CONFIG_IP_NF_TARGET_MARK=y
CONFIG_IP_NF_TARGET_CLASSIFY=y
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_IP6_NF_QUEUE=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_LIMIT=y
CONFIG_IP6_NF_MATCH_MAC=y
CONFIG_IP6_NF_MATCH_RT=y
CONFIG_IP6_NF_MATCH_OPTS=y
CONFIG_IP6_NF_MATCH_FRAG=y
CONFIG_IP6_NF_MATCH_HL=y
CONFIG_IP6_NF_MATCH_MULTIPORT=y
CONFIG_IP6_NF_MATCH_OWNER=y
CONFIG_IP6_NF_MATCH_MARK=y
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
CONFIG_IP6_NF_MATCH_AHESP=y
CONFIG_IP6_NF_MATCH_LENGTH=y
CONFIG_IP6_NF_MATCH_EUI64=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_LOG=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_TARGET_MARK=y
CONFIG_IP6_NF_RAW=y
CONFIG_XFRM=y
CONFIG_NETDEVICES=y
CONFIG_DUMMY=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
CONFIG_NET_PCI=y
CONFIG_8139TOO=y
CONFIG_E1000=y
CONFIG_INPUT=y
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=y
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SOUND_GAMEPORT=y
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_CORE=y
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
CONFIG_PRINTER=y
CONFIG_HW_RANDOM=y
CONFIG_RTC=y
CONFIG_AGP=y
CONFIG_AGP_INTEL=y
CONFIG_DRM=y
CONFIG_DRM_RADEON=y
CONFIG_HPET=y
CONFIG_HPET_MMAP=y
CONFIG_HANGCHECK_TIMER=y
CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
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_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
CONFIG_FB_RADEON=y
CONFIG_FB_RADEON_I2C=y
CONFIG_VGA_CONSOLE=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_SUN12x22=y
CONFIG_LOGO=y
CONFIG_LOGO_LINUX_MONO=y
CONFIG_LOGO_LINUX_VGA16=y
CONFIG_LOGO_LINUX_CLUT224=y
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_HWDEP=y
CONFIG_SND_RAWMIDI=y
CONFIG_SND_SEQUENCER=y
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RTCTIMER=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_AC97_CODEC=y
CONFIG_SND_EMU10K1=y
CONFIG_SND_INTEL8X0=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_PRINTER=y
CONFIG_USB_STORAGE=y
CONFIG_USB_MON=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=y
CONFIG_REISERFS_FS=y
CONFIG_XFS_FS=y
CONFIG_INOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_UDF_FS=y
CONFIG_UDF_NLS=y
CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_RAMFS=y
CONFIG_UFS_FS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
CONFIG_SUNRPC=y
CONFIG_MSDOS_PARTITION=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
CONFIG_LOG_BUF_SHIFT=15
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_EARLY_PRINTK=y
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
CONFIG_CRYPTO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_SMP=y
CONFIG_X86_HT=y
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_PC=y
Good luck,
Jurriaan
--
You stay here, Audrey -- this is between me and the vegetable!
Seymour, from Little Shop Of Horrors
Debian (Unstable) GNU/Linux 2.6.11-mm1 2x4734 bogomips load 0.38
compiling -mm2 on my x86 box results in:
SYSMAP .tmp_System.map
Inconsistent kallsyms data
Try setting CONFIG_KALLSYMS_EXTRA_PASS
make: *** [vmlinux] Fehler 1
gcc-Version 3.4.3 20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)
Dominik
Paul Mundt <[email protected]> wrote:
>
> With this I can build on sh again. The other solution is to add the
> include to asm/bug.h directly, but it would be nice to avoid linux/
> includes from asm/ context in general..
>
> Thoughts? Or ideas for a more appropriate fix?
>
> --- linux-sh-2.6.11-mm2.orig/include/linux/list.h 2005-03-08 15:46:50.601565604 +0200
> +++ linux-sh-2.6.11-mm2/include/linux/list.h 2005-03-08 15:46:53.882114403 +0200
> @@ -5,6 +5,7 @@
>
> #include <linux/stddef.h>
> #include <linux/prefetch.h>
> +#include <linux/kernel.h>
> #include <asm/system.h>
> #include <asm/bug.h>
It always feels bad doing something like the above, because you *know* it's
going to slow the compile down.
Happily, this change is only needed in -mm, so I'll add it to
list_del-debug.patch, thanks.
Dominik Brodowski <[email protected]> wrote:
>
> compiling -mm2 on my x86 box results in:
>
> SYSMAP .tmp_System.map
> Inconsistent kallsyms data
> Try setting CONFIG_KALLSYMS_EXTRA_PASS
> make: *** [vmlinux] Fehler 1
>
> gcc-Version 3.4.3 20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)
>
Did CONFIG_KALLSYMS_EXTRA_PASS fix it up?
On Tue, Mar 08, 2005 at 12:35:54PM -0800, Andrew Morton wrote:
> Dominik Brodowski <[email protected]> wrote:
> >
> > compiling -mm2 on my x86 box results in:
> >
> > SYSMAP .tmp_System.map
> > Inconsistent kallsyms data
> > Try setting CONFIG_KALLSYMS_EXTRA_PASS
> > make: *** [vmlinux] Fehler 1
> >
> > gcc-Version 3.4.3 20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)
> >
>
> Did CONFIG_KALLSYMS_EXTRA_PASS fix it up?
Yes.
Dominik
> +sh-merge-updates.patch
>
> sh/sh64 updates
btw, it would be nice if you'd give a period of say 48 hours for
people to review non-critical patches before sending them off to
Linus. The sh update was pretty nice, so no coplaints about this
one, but we had worse things passed on in the past.
> +open-iscsi-scsi.patch
> +open-iscsi-headers.patch
> +open-iscsi-kconfig.patch
> +open-iscsi-makefile.patch
> +open-iscsi-netlink.patch
> +open-iscsi-doc.patch
>
> iSCSI driver
Please don't put this in. It's fairly experimental and just one
of three iscsi initiators we're (scsi folks) currently evaluating
for inclusion.
Christoph Hellwig <[email protected]> wrote:
>
> > +sh-merge-updates.patch
> >
> > sh/sh64 updates
>
> btw, it would be nice if you'd give a period of say 48 hours for
> people to review non-critical patches before sending them off to
> Linus. The sh update was pretty nice, so no coplaints about this
> one, but we had worse things passed on in the past.
Yup, I've asked Paul to cc lkml in the future.
> > +open-iscsi-scsi.patch
> > +open-iscsi-headers.patch
> > +open-iscsi-kconfig.patch
> > +open-iscsi-makefile.patch
> > +open-iscsi-netlink.patch
> > +open-iscsi-doc.patch
> >
> > iSCSI driver
>
> Please don't put this in. It's fairly experimental and just one
> of three iscsi initiators we're (scsi folks) currently evaluating
> for inclusion.
I'll frequently add things like this just so they get additional
compile-coverage testing and to get wider reviewing. And someone might run
sparse, checkstack, reference_discarded or reference_init on it.
On Tue, 2005-03-08 at 23:36 +0000, J.A. Magallon wrote:
> Can cpu affinity really be changed for a running process ?
Yes.
> Does it need something like io or yielding to take effect ?
No.
> I am playin with Robert Love's taskset (symlinked to runon, it is easier
> to type and I'm more used to it), because I want to play with hyperthreading
> and wanted a method to force two threads on the same physical package.
> It works fine to bound a new process to a cpu set, but I does not change
> anything for a running process.
>
> I try runon -c -p 0 <pid> for my numbercruncher and it does nothing, top
> shows it is in the same cpus where it started:
>
> werewolf:~# runon -c -p 0 8277
> pid 8277's current affinity list: 0-3
> pid 8277's new affinity list: 0
> werewolf:~# runon -c -p 8277
> pid 8277's current affinity list: 0
This looks fine. As expected.
Although, you have the syntax wrong. It should be
taskset -c 0 -p 8277
and
taskset -p 8277
> The program uses posix threads, 2 in this case. The two threads change from
> cpu sometimes (not too often), but do not go into the same processor
> immediately as when I start the program directly with runon/taskset.
You have to bind all of the threads individually.
Robert Love
On Tue, 2005-03-08 at 23:51 +0000, J.A. Magallon wrote:
> Ahh, damn, that explains it. I use a main thread that does nothing but
> wait for the worker threads. So it sure gets moved to CPU0, but as it
> does not waste CPU time, I do not see it...
>
> Thanks. Will see what can I do with my threads. cpusets, perhaps...
Affinity is inherited.
Start the threads in a shell script that runs taskset on itself. Or
just modify this program to have the main thread do sched_setaffinity()
on itself.
Robert Love
On 03.09, Robert Love wrote:
> On Tue, 2005-03-08 at 23:36 +0000, J.A. Magallon wrote:
>
> > Can cpu affinity really be changed for a running process ?
>
> Yes.
>
> > Does it need something like io or yielding to take effect ?
>
> No.
>
...
>
> Although, you have the syntax wrong. It should be
>
> taskset -c 0 -p 8277
>
That was what I first tried, but:
werewolf:~> ps -ef | grep box
magallon 8638 8629 99 00:47 pts/0 00:01:54 box-d --out box.srf @opt
magallon 8733 8643 0 00:48 pts/2 00:00:00 grep box
werewolf:~> taskset -c 0 -p 8638
execvp: No such file or directory
failed to execute -p
>
> > The program uses posix threads, 2 in this case. The two threads change from
> > cpu sometimes (not too often), but do not go into the same processor
> > immediately as when I start the program directly with runon/taskset.
>
> You have to bind all of the threads individually.
>
Ahh, damn, that explains it. I use a main thread that does nothing but
wait for the worker threads. So it sure gets moved to CPU0, but as it
does not waste CPU time, I do not see it...
Thanks. Will see what can I do with my threads. cpusets, perhaps...
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandrakelinux release 10.2 (Cooker) for i586
Linux 2.6.11-jam3 (gcc 3.4.3 (Mandrakelinux 10.2 3.4.3-3mdk)) #1
On Tue, Mar 08, 2005 at 03:38:46AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.11-mm1:
>...
> -fix-buggy-ieee80211_crypt_-selects.patch
>
> Was wrong.
>...
I'd say my patch was correct.
If it was buggy, I have yet to see a better patch.
With the current dependencies, IEEE80211_CRYPT_CCMP and
IEEE80211_CRYPT_TKIP can't be included into Linus' tree since selecting
them can result in invalid .config's [1].
cu
Adrian
[1] no matter how you think to be guilty - from a user's point
of view it's simply currently broken
--
"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
On Tue, Mar 08, 2005 at 03:38:46AM -0800, Andrew Morton wrote:
>...
> Changes since 2.6.11-mm1:
>...
> +drivers-isdn-tpam-convert-to-pci_register_driver.patch
>...
> Little code tweaks.
>...
Please drop this patch.
Karsten has a patch ready to remove this driver (because the hardware it
was supposed to drive never went into production), and such patches only
cause needless rediffs.
@Karsten:
Could you submit your patch to remove tpam to Andrew?
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
HI all...
On 03.08, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/
>
(replied to this because this is the kernel I am testing on :) )
Can cpu affinity really be changed for a running process ?
Does it need something like io or yielding to take effect ?
I am playin with Robert Love's taskset (symlinked to runon, it is easier
to type and I'm more used to it), because I want to play with hyperthreading
and wanted a method to force two threads on the same physical package.
It works fine to bound a new process to a cpu set, but I does not change
anything for a running process.
I try runon -c -p 0 <pid> for my numbercruncher and it does nothing, top
shows it is in the same cpus where it started:
werewolf:~# runon -c -p 0 8277
pid 8277's current affinity list: 0-3
pid 8277's new affinity list: 0
werewolf:~# runon -c -p 8277
pid 8277's current affinity list: 0
The program uses posix threads, 2 in this case. The two threads change from
cpu sometimes (not too often), but do not go into the same processor
immediately as when I start the program directly with runon/taskset.
Any idea ?
TIA
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandrakelinux release 10.2 (Cooker) for i586
Linux 2.6.11-jam3 (gcc 3.4.3 (Mandrakelinux 10.2 3.4.3-3mdk)) #1
Adrian Bunk <[email protected]> wrote:
>
> On Tue, Mar 08, 2005 at 03:38:46AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.11-mm1:
> >...
> > -fix-buggy-ieee80211_crypt_-selects.patch
> >
> > Was wrong.
> >...
>
> I'd say my patch was correct.
Uh, OK. Make that "was subject of interminable bunfight".
Feel free to resend and I'll keep spamming Jeff with it.
Andrew Morton wrote:
> Adrian Bunk <[email protected]> wrote:
>
>>On Tue, Mar 08, 2005 at 03:38:46AM -0800, Andrew Morton wrote:
>>
>>>...
>>>Changes since 2.6.11-mm1:
>>>...
>>>-fix-buggy-ieee80211_crypt_-selects.patch
>>>
>>> Was wrong.
>>>...
>>
>>I'd say my patch was correct.
>
>
> Uh, OK. Make that "was subject of interminable bunfight".
>
> Feel free to resend and I'll keep spamming Jeff with it.
It's quite simple: one specifies dependencies in one place, so that one
does not have specify dependencies in _every_ place.
AFAICS the thread already reaches that point, people [most of them]
agree with me, and then throw up their hands as to a fix.
Jeff
On Wed, Mar 09, 2005 at 01:20:46AM +0100, Adrian Bunk wrote:
> On Tue, Mar 08, 2005 at 03:38:46AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.11-mm1:
> >...
> > +drivers-isdn-tpam-convert-to-pci_register_driver.patch
> >...
> > Little code tweaks.
> >...
>
> Please drop this patch.
>
> Karsten has a patch ready to remove this driver (because the hardware it
> was supposed to drive never went into production), and such patches only
> cause needless rediffs.
>
> @Karsten:
> Could you submit your patch to remove tpam to Andrew?
>
:-) already done few houres ago (against -mm2)
--
Karsten Keil
SuSE Labs
ISDN development
Dominik Brodowski wrote:
> On Tue, Mar 08, 2005 at 12:35:54PM -0800, Andrew Morton wrote:
>
>>Dominik Brodowski <[email protected]> wrote:
>>
>>>compiling -mm2 on my x86 box results in:
>>>
>>>SYSMAP .tmp_System.map
>>>Inconsistent kallsyms data
>>>Try setting CONFIG_KALLSYMS_EXTRA_PASS
>>>make: *** [vmlinux] Fehler 1
>>>
>>>gcc-Version 3.4.3 20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)
>>>
>>
>>Did CONFIG_KALLSYMS_EXTRA_PASS fix it up?
>
>
> Yes.
It doesn't happen to me here :(
Can you send me privately a tar.bz2 containing your .config,
.tmp_kallsyms1.S and .tmp_kallsyms2.S so I can try to figure out what's
going on?
TIA,
--
Paulo Marques - http://www.grupopie.com
All that is necessary for the triumph of evil is that good men do nothing.
Edmund Burke (1729 - 1797)
Paulo Marques wrote:
> [...]
> Can you send me privately a tar.bz2 containing your .config,
> .tmp_kallsyms1.S and .tmp_kallsyms2.S so I can try to figure out what's
> going on?
Ok, after some investigation into the files I was able to find out the
problem.
scripts/kallsyms.c uses a subset of the symbol table to optimize the
tokens to use to compress the symbols. It does this because using the
complete set of symbols would be much slower without a significant gain
in compression.
For some reason, in the files sent by Dominik, two aliased symbols
change places from the first to the second step of the kallsyms build
process (__sched_text_start, __down).
Because of this, the subset used for optimization is different and so
are the tokens selected, producing a 2 byte difference in the total size
of the compressed symbol names :P
So I must change the sampling algorithm in a way that is robust to
symbol position changes.
A simple and robust way is to do the sampling on a list of symbols
sorted by symbol name. This way, even if the symbol positions that are
given to scripts/kallsyms change, the symbols sampled will be the same.
I'll do the patch to do this and send it ASAP.
--
Paulo Marques - http://www.grupopie.com
All that is necessary for the triumph of evil is that good men do nothing.
Edmund Burke (1729 - 1797)
Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/
Hi Andrew
With 2.6.11-mm series, "acpi_poweroff called" problem is back again (it
disappeared in 2.6.11-rc-mm and actually never happend in Linus' tree).
So when you shutdown, you have to unplug power cord or so to switch off
because the system hangs after that message is displayed.
Bye
--
Stefano RIVOIR
Stefano Rivoir <[email protected]> wrote:
>
> Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/
>
> Hi Andrew
>
> With 2.6.11-mm series, "acpi_poweroff called" problem is back again (it
> disappeared in 2.6.11-rc-mm and actually never happend in Linus' tree).
> So when you shutdown, you have to unplug power cord or so to switch off
> because the system hangs after that message is displayed.
>
Does the below fix it?
If so, sorry, this patch was dropped because it just does everything the
wrong way, and the acpi guys are cooking up some scheme to fix it for real.
From: "Marcos D. Marado Torres" <[email protected]>
From: "Barry K. Nathan" <[email protected]>
On Tue, Feb 08, 2005 at 08:54:06PM -0800, Andrew Morton wrote:
> "Marcos D. Marado Torres" <[email protected]> wrote:
> >
> > Please add to -mm the patch in attachment, since it solves the old
> > acpi_power_off bug...
>
> What acpi_power_off bug? And how does it solve it?
Here's the observed bug that the patch is trying to fix:
http://bugme.osdl.org/show_bug.cgi?id=4041
What Marcos posted is a typo-corrected version of Eric Biederman's
patch:
http://marc.theaimsgroup.com/?l=linux-kernel&m=110665542929525&w=2
In Eric's own words, the patch "needs some work before it goes into a
mainline kernel". AFAICT it's more of a proof-of-concept, just to see if
Eric's on the right track...
This is the motivation behind the patch:
http://marc.theaimsgroup.com/?l=linux-kernel&m=110665405402747&w=2
Signed-off-by: Andrew Morton <[email protected]>
---
25-akpm/drivers/acpi/sleep/poweroff.c | 23 +++++++++++++++++++++--
25-akpm/drivers/base/power/shutdown.c | 7 +++++++
2 files changed, 28 insertions(+), 2 deletions(-)
diff -puN drivers/acpi/sleep/poweroff.c~acpi_power_off-bug-fix drivers/acpi/sleep/poweroff.c
--- 25/drivers/acpi/sleep/poweroff.c~acpi_power_off-bug-fix 2005-02-23 01:48:08.000000000 -0800
+++ 25-akpm/drivers/acpi/sleep/poweroff.c 2005-02-23 01:48:08.000000000 -0800
@@ -7,18 +7,37 @@
#include <linux/pm.h>
#include <linux/init.h>
+#include <linux/kernel.h>
#include <acpi/acpi_bus.h>
#include <linux/sched.h>
#include "sleep.h"
static void
+acpi_power_off_prepare(void)
+{
+ if (system_state == SYSTEM_POWER_OFF) {
+ acpi_wakeup_gpe_poweroff_prepare();
+ acpi_enter_sleep_state_prep(ACPI_STATE_S5);
+ }
+}
+
+void
+do_acpi_power_off_prepare(void)
+{
+ if (!acpi_disabled) {
+ acpi_power_off_prepare();
+ }
+}
+
+
+static void
acpi_power_off (void)
{
printk("%s called\n",__FUNCTION__);
+#if 0 /* This should be made redundant by other patches.. */
/* Some SMP machines only can poweroff in boot CPU */
set_cpus_allowed(current, cpumask_of_cpu(0));
- acpi_wakeup_gpe_poweroff_prepare();
- acpi_enter_sleep_state_prep(ACPI_STATE_S5);
+#endif
ACPI_DISABLE_IRQS();
acpi_enter_sleep_state(ACPI_STATE_S5);
}
diff -puN drivers/base/power/shutdown.c~acpi_power_off-bug-fix drivers/base/power/shutdown.c
--- 25/drivers/base/power/shutdown.c~acpi_power_off-bug-fix 2005-02-23 01:48:08.000000000 -0800
+++ 25-akpm/drivers/base/power/shutdown.c 2005-02-23 01:48:08.000000000 -0800
@@ -62,6 +62,13 @@ void device_shutdown(void)
}
up_write(&devices_subsys.rwsem);
+#ifdef CONFIG_ACPI
+ {
+ extern void do_acpi_power_off_prepare(void);
+ do_acpi_power_off_prepare();
+ }
+#endif
+
sysdev_shutdown();
}
_
--- ./scripts/kallsyms.c.orig 2005-03-10 11:00:26.000000000 +0000
+++ ./scripts/kallsyms.c 2005-03-10 11:11:50.000000000 +0000
@@ -499,11 +499,30 @@ static void forget_symbol(unsigned char
forget_token(symbol + i, len - i);
}
+/* sort the symbols by address->name so that even if aliased symbols
+ * change position, or the symbols are not supplied in address order
+ * the algorithm will work nevertheless */
+
+static int sort_by_address_name(const void *a, const void *b)
+{
+ struct sym_entry *sa, *sb;
+
+ sa = (struct sym_entry *) a;
+ sb = (struct sym_entry *) b;
+
+ if (sa->addr != sb->addr)
+ return sa->addr - sb->addr;
+
+ return strcmp(sa->sym + 1, sb->sym + 1);
+}
+
/* set all the symbol flags and do the initial token count */
static void build_initial_tok_table(void)
{
int i, use_it, valid;
+ qsort(table, cnt, sizeof(table[0]), sort_by_address_name);
+
valid = 0;
for (i = 0; i < cnt; i++) {
table[i].flags = 0;
On Tue, Mar 08, 2005 at 07:54:11PM +0100, Jurriaan wrote:
> mm/fremap.c:33:48: macro "flush_cache_page" passed 3 arguments, but takes just 2
> mm/fremap.c: In function `zap_pte':
> mm/fremap.c:33: error: `flush_cache_page' undeclared (first use in this function)
> mm/fremap.c:33: error: (Each undeclared identifier is reported only once
> mm/fremap.c:33: error: for each function it appears in.)
> mm/fremap.c:34:55: macro "ptep_get_and_clear" passed 3 arguments, but takes just 1
> mm/fremap.c:34: error: `ptep_get_and_clear' undeclared (first use in this function)
> mm/fremap.c:48:41: macro "pte_clear" passed 3 arguments, but takes just 1
> mm/fremap.c:48: error: `pte_clear' undeclared (first use in this function)
> mm/fremap.c: In function `install_page':
> mm/fremap.c:97: warning: implicit declaration of function `set_pte_at'
> make[1]: *** [mm/fremap.o] Error 1
> make: *** [mm] Error 2
>
> The same config worked fine for 2.6.11-mm1:
>...
I wasn't able to reproduce this with your .config .
Are you using a completely otherwise unpatched 2.6.11-mm2?
Please retry with a freshly unpacked 2.6.11 plus the -mm2 patch.
> Good luck,
> Jurriaan
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
On Thu, Mar 10, 2005 at 12:12:22PM +0000, Paulo Marques wrote:
> Paulo Marques wrote:
> >[...]
> >A simple and robust way is to do the sampling on a list of symbols
> >sorted by symbol name. This way, even if the symbol positions that are
> >given to scripts/kallsyms change, the symbols sampled will be the same.
> >
> >I'll do the patch to do this and send it ASAP.
>
> Ok, here it is.
>
> Dominik can you try the attached patch and see if it solves the problem?
Hi Paulo.
Alexander Stohr had similar problems with down and __sched_text_start.
I figured out that what was causing the troubles was the fact that the
linker generated symbol __sched_text_start changed value from pass 1 to
pass 2. The reason for this was the alingment used within that section.
My stamp on this is attached.
I never came around submitting this since I do not know what the correct
number for function alignment is on different paltforms.
Sam
===== include/asm-generic/vmlinux.lds.h 1.16 vs edited =====
--- 1.16/include/asm-generic/vmlinux.lds.h 2004-10-06 18:45:06 +02:00
+++ edited/include/asm-generic/vmlinux.lds.h 2004-11-06 21:56:11 +01:00
@@ -6,6 +6,11 @@
#define VMLINUX_SYMBOL(_sym_) _sym_
#endif
+/* Aling functions to a 8 byte boundary.
+ * This prevents lables defined to mark start/end of section to differ
+ * during pass 1 and pass 2 when generating System.map */
+#define ALIGN_FUNCTION() . = ALIGN(8)
+
#define RODATA \
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
*(.rodata) *(.rodata.*) \
@@ -77,11 +82,13 @@
}
#define SCHED_TEXT \
+ ALIGN_FUNCTION(); \
VMLINUX_SYMBOL(__sched_text_start) = .; \
*(.sched.text) \
VMLINUX_SYMBOL(__sched_text_end) = .;
#define LOCK_TEXT \
+ ALIGN_FUNCTION(); \
VMLINUX_SYMBOL(__lock_text_start) = .; \
*(.spinlock.text) \
VMLINUX_SYMBOL(__lock_text_end) = .;
Sam Ravnborg wrote:
> On Thu, Mar 10, 2005 at 12:12:22PM +0000, Paulo Marques wrote:
>
>>Paulo Marques wrote:
>>
>>>[...]
>>>A simple and robust way is to do the sampling on a list of symbols
>>>sorted by symbol name. This way, even if the symbol positions that are
>>>given to scripts/kallsyms change, the symbols sampled will be the same.
>>>
>>>I'll do the patch to do this and send it ASAP.
>>
>>Ok, here it is.
>>
>>Dominik can you try the attached patch and see if it solves the problem?
>
> Hi Paulo.
Hi Sam :)
> Alexander Stohr had similar problems with down and __sched_text_start.
>
> I figured out that what was causing the troubles was the fact that the
> linker generated symbol __sched_text_start changed value from pass 1 to
> pass 2. The reason for this was the alingment used within that section.
Damn, you're right. Looking more carefully at Dominik's files I can see
that on the first pass we have:
T __sched_text_start PTR 0xc0420482
t __down PTR 0xc0420484
and on the second pass:
t __down PTR 0xc0420484
T __sched_text_start PTR 0xc0420484
I only looked at the addresses on the second pass and noticed they were
aliased symbols and that the symbol order changed from the first pass :P
> I never came around submitting this since I do not know what the correct
> number for function alignment is on different paltforms.
If this will just align the beginning of a section, I don't think it
will be a problem to always align at 8 bytes even on platforms that need
only a 4 byte alignment.
So I think that your patch should definitely go in, as it solves a real
problem.
As for my patch it could potentially solve problems that we don't
currently have(*), so it is probably better to wait for them to appear
before trying to solve an non-existent problem :)
--
Paulo Marques - http://www.grupopie.com
All that is necessary for the triumph of evil is that good men do nothing.
Edmund Burke (1729 - 1797)
(*) order of aliased symbols changing, or 'nm' returning non sorted
addresses.
On Sun, Mar 13, 2005 at 09:54:41AM +0100, Sam Ravnborg wrote:
> On Thu, Mar 10, 2005 at 12:12:22PM +0000, Paulo Marques wrote:
> > Paulo Marques wrote:
> > >[...]
> > >A simple and robust way is to do the sampling on a list of symbols
> > >sorted by symbol name. This way, even if the symbol positions that are
> > >given to scripts/kallsyms change, the symbols sampled will be the same.
> > >
> > >I'll do the patch to do this and send it ASAP.
> >
> > Ok, here it is.
> >
> > Dominik can you try the attached patch and see if it solves the problem?
> Hi Paulo.
>
> Alexander Stohr had similar problems with down and __sched_text_start.
>
> I figured out that what was causing the troubles was the fact that the
> linker generated symbol __sched_text_start changed value from pass 1 to
> pass 2. The reason for this was the alingment used within that section.
>
> My stamp on this is attached.
>
> I never came around submitting this since I do not know what the correct
> number for function alignment is on different paltforms.
This patch fixes it on my (x86) system.
Thanks,
Dominik
On Thu, Mar 10, 2005 at 12:12:22PM +0000, Paulo Marques wrote:
> Paulo Marques wrote:
> >[...]
> >A simple and robust way is to do the sampling on a list of symbols
> >sorted by symbol name. This way, even if the symbol positions that are
> >given to scripts/kallsyms change, the symbols sampled will be the same.
> >
> >I'll do the patch to do this and send it ASAP.
>
> Ok, here it is.
>
> Dominik can you try the attached patch and see if it solves the problem?
It does not solve the problem:
~/local/kernel/linux-2.6.11-mm2 $ patch -p1 < ~/kallpatch
patching file scripts/kallsyms.c
~/local/kernel/linux-2.6.11-mm2 $ make
CHK include/linux/version.h
HOSTCC scripts/kallsyms
make[1]: ?arch/i386/kernel/asm-offsets.s? ist bereits aktualisiert.
CHK include/linux/compile.h
CHK usr/initramfs_list
CC [M] arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.o
KSYM .tmp_kallsyms1.S
AS .tmp_kallsyms1.o
LD .tmp_vmlinux2
KSYM .tmp_kallsyms2.S
AS .tmp_kallsyms2.o
LD vmlinux
SYSMAP System.map
SYSMAP .tmp_System.map
Inconsistent kallsyms data
Try setting CONFIG_KALLSYMS_EXTRA_PASS
make: *** [vmlinux] Fehler 1
Will test the other patch floating around in just a moment.
Thanks,
Dominik
Stefano Rivoir <[email protected]> wrote:
>
> Andrew Morton wrote:
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm2/
>
> Hi Andrew
>
> With 2.6.11-mm series, "acpi_poweroff called" problem is back again (it
> disappeared in 2.6.11-rc-mm and actually never happend in Linus' tree).
> So when you shutdown, you have to unplug power cord or so to switch off
> because the system hangs after that message is displayed.
>
Some work has been done on this in the ACPI tree. Can you please test
2.6.12-rc1-mm1?