* 2.6.16-rc4-mm2
@ 2006-02-24 11:10 Andrew Morton
2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa
` (12 more replies)
0 siblings, 13 replies; 34+ messages in thread
From: Andrew Morton @ 2006-02-24 11:10 UTC (permalink / raw)
To: linux-kernel
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/
- Sam's new section-mismatch warning code detects 358 errors in my alpha
build, and a quick sampling indicates that they're real. Once this hits
mainline things will get somewhat messy.
- The git-blktrace tree was dropped, due to a bad disagreement with the
relayfs rework in Greg's tree.
- Various buggy patches which were in -mm1 were dropped. Should be better.
(ie: some new, more interesting bugs).
Boilerplate:
- See the `hot-fixes' directory for any important updates to this patchset.
- To fetch an -mm tree using git, use (for example)
git fetch git://git.kernel.org/pub/scm/linux/kernel/git/smurf/linux-trees.git v2.6.16-rc2-mm1
- -mm kernel commit activity can be reviewed by subscribing to the
mm-commits mailing list.
echo "subscribe mm-commits" | mail majordomo@vger.kernel.org
- If you hit a bug in -mm and it's not obvious which patch caused it, it is
most valuable if you can perform a bisection search to identify which patch
introduced the bug. Instructions for this process are at
http://www.zip.com.au/~akpm/linux/patches/stuff/bisecting-mm-trees.txt
But beware that this process takes some time (around ten rebuilds and
reboots), so consider reporting the bug first and if we cannot immediately
identify the faulty patch, then perform the bisection search.
- When reporting bugs, please try to Cc: the relevant maintainer and mailing
list on any email.
Changes since 2.6.16-rc4-mm1:
linus.patch
git-acpi.patch
git-alsa.patch
git-audit-master.patch
git-cfq.patch
git-cifs.patch
git-cpufreq.patch
git-drm.patch
git-ia64.patch
git-infiniband.patch
git-input.patch
git-jfs.patch
git-kbuild.patch
git-libata-all.patch
git-netdev-all.patch
git-net.patch
git-ntfs.patch
git-ocfs2.patch
git-powerpc.patch
git-sym2.patch
git-pcmcia.patch
git-scsi-misc.patch
git-scsi-rc-fixes.patch
git-sas-jg.patch
git-sparc64.patch
git-watchdog.patch
git-xfs.patch
git-cryptodev.patch
git-viro-bird-fixes.patch
git-viro-bird-m32r.patch
git-viro-bird-m68k.patch
git-viro-bird-xfs.patch
git-viro-bird-uml.patch
git-viro-bird-frv.patch
git-viro-bird-misc.patch
git-viro-bird-upf.patch
git-viro-bird-volatile.patch
git-viro-bird-endian.patch
git trees.
-oom-kill-children-accounting.patch
-terminate-process-that-fails-on-a-constrained-allocation-v3.patch
-i386-need-to-pass-virtual-address-to-smp_read_mpc.patch
-cfi_cmdset_0001-fix-range-for-cache-invalidation.patch
-spi-fix-modular-master-driver-remove-and-device-suspend-remove.patch
-x86_64-dont-set-config_debug_info-in-defconfig.patch
-cpu-hotplug-documentation-fix.patch
-suspend-to-ram-allow-video-options-to-be-set-at-runtime.patch
-suspend-to-ram-allow-video-options-to-be-set-at-runtime-update.patch
-fix-units-in-mbind-check.patch
-fix-race-condition-in-hvc-console.patch
-daemonize-detach-from-current-namespace.patch
-fix-snd-usb-audio-in-32-bit-compat-environemt.patch
-pktcdvd-correctly-set-rq-cmd_len-in-pkt_generic_packet.patch
-pktcdvd-rename-functions-and-make-their-return-values-sane.patch
-pktcdvd-remove-useless-printk-statements.patch
-pktcdvd-fix-the-logic-in-the-pkt_writable_track-function.patch
-pktcdvd-only-return-erofs-when-appropriate.patch
-modules-with-old-style-parameters-wont-load.patch
-modules-with-old-style-parameters-wont-load-fix.patch
-v9fs-update-documentation-and-fix-debug-flag.patch
-powermac-fix-loss-of-ethernet-phy-on-sleep.patch
-fix-undefined-symbols-for-nommu-architecture-improved-version.patch
-fix-compile-for-config_sysvipc=n-or-config_sysctl=n.patch
-reset-pci-device-state-to-unknown-after-disabled.patch
-ipw2200-suppress-warning-message.patch
-drivers-fc4-fcc-memset-correct-length.patch
-firmware-fix-bug-in-fw_realloc_buffer.patch
-spi-per-transfer-overrides-for-wordsize-and-clocking.patch
-sem2mutex-drivers-media-2.patch
-sky2-fix-a-hang-on-yukon-ec-0xb6-rev-1.patch
-gregkh-pci-acpiphp-add-new-bus-to-acpi.patch
-pci-pci-quirk-for-asus-a8v-and-a8v-deluxe-motherboards.patch
-usb-zc0301-driver-updates.patch
-page-migration-fix-mpol_interleave-behavior-for-migration-via.patch
-page-migration-fix-mpol_interleave-behavior-for-migration-via-fix.patch
-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix.patch
-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix-tidy.patch
-pci-cardbus-cards-hidden-needs-pci=assign-busses-to-fix-tidy-fix.patch
-include-asm-m68k-irqh-remove-unused-define-enable_irq_nosync.patch
-radeonfb-resume-support-for-samsung-p35-laptops.patch
Merged
+cache-align-futex-hash-buckets.patch
futex speedup (not final)
+m32r-enable-asm-code-optimization.patch
+m32r-fix-and-update-for-gcc-40.patch
+remove-module_parm.patch
+remove-module_parm-fix.patch
+snd-cs4236-tpyo-fix.patch
+alsa-fix-bogus-snd_device_free-in-opl3-ossc.patch
+pnp-bus-type-fix.patch
+uml-correct-error-messages-in-cow-driver.patch
+uml-fix-usage-of-kernel_errno-in-place-of-errno.patch
+uml-fix-unused-attribute.patch
+uml-os_connect_socket-error-path-fixup.patch
+uml-better-error-reporting-for-read_output.patch
+uml-tidying-cow-code.patch
+vgacon-no-vertical-resizing-on-ega.patch
+kprobes-causes-nx-protection-fault-on-i686-smp.patch
+powerpc-fix-altivec_unavailable_exception-oopses.patch
+cfi-init-wait-queue-in-chip-struct.patch
+voyager-fix-boot-panic-by-adding-topology-export.patch
+voyager-fix-the-cpu_possible_map-to-make-voyager-boot-again.patch
+page-migration-fix-mpol_interleave-behavior-for-migration-via.patch
+x86-fix-smp-boot-sequence.patch
+x86-fix-smp-boot-sequence-fix.patch
+gbefb-ip32-gbefb-depth-change-fix.patch
+gbefb-set-default-of-fb_gbe_mem-to-4-mb.patch
+au1100fb-replaced-io_remap_page_range-with-io_remap_pfn_range.patch
+asiliantfb-fix-pseudo_palette-setup-in-asiliantfb_setcolreg.patch
+flags-parameter-for-linkat.patch
+flags-parameter-for-linkat-fix.patch
+vmscan-fix-zone_reclaim.patch
Current 2.6.16 queue. Some of these are a bit questionable at this stage.
+gregkh-driver-sysfs-relay-channel-buffers-as-sysfs-attributes.patch
+gregkh-driver-relay-consolidate-relayfs-core-into-kernel-relay.c.patch
+gregkh-driver-sysfs-update-relay-file-support-for-generic-relay-api.patch
+gregkh-driver-relayfs-remove-relayfs-in-favour-of-config_relay.patch
+gregkh-driver-relay-relay-header-cleanup.patch
+gregkh-driver-sysfs-add-__attr_relay-helper-for-relay-attributes.patch
+gregkh-driver-sysfs-kzalloc-conversion.patch
+gregkh-driver-firmware-fix-bug-in-fw_realloc_buffer.patch
+gregkh-driver-spi-per-transfer-overrides-for-wordsize-and-clocking.patch
Driver tree updates
+add-cpia2-camera-support.patch
CPIA camera driver
+gregkh-i2c-w1-use-kthread-api.patch
i2c tree
+pc-speaker-add-snd_silent.patch
Bring back yet again the pc-speaker SND_SILENT patch. I can't get rid of
the thing.
+remove-the-config_cc_align_-options.patch
kbuild cleanup
+drivers-scsi-libata-scsic-make-some-functions-static.patch
scsi cleanup
+tg3-netif_carrier_off-runs-too-early-could-still-be-queued-when-init-fails.patch
tg3 fix (nacked by maintainer)
+config_forcedeth-updates.patch
forcedeth driver fixes
+serial-serial_txx9-driver-update.patch
This got lost. Another patch I cannot get rid of. Should I send them
daily?
+serial-kernel-console-should-send-crlf-not-lfcr.patch
serial driver \n\r -> \r\n fixes
+gregkh-pci-pci-avoid-leaving-master_abort-disabled-permanently-when-returning-from-pci_scan_bridge.patch
+gregkh-pci-shpchp-remove-unused-pci_bus-member-from-controller-structure.patch
+gregkh-pci-shpchp-remove-unused-wait_for_ctrl_irq.patch
+gregkh-pci-shpchp-event-handling-rework.patch
+gregkh-pci-shpchp-fix-slot-state-handling.patch
+gregkh-pci-shpchp-adapt-to-pci-driver-model.patch
+gregkh-pci-pci-add-pci_device_shutdown-to-pci_bus_type.patch
+gregkh-pci-pci-smbus-unhide-on-hp-compaq-nx6110.patch
+gregkh-pci-pci-pci-quirk-for-asus-a8v-and-a8v-deluxe-motherboards.patch
+gregkh-pci-pci-make-msi-quirk-inheritable-from-the-pci-bus.patch
+gregkh-pci-pci-msi-save-restore-for-suspend-resume.patch
+gregkh-pci-pci-remove-msi-save-restore-code-in-specific-driver.patch
+gregkh-pci-pci-resource-address-mismatch.patch
+gregkh-pci-pci-fix-problems-with-msi-x-on-ia64.patch
+gregkh-pci-pci-pci-cardbus-cards-hidden-needs-pci-assign-busses-to-fix.patch
+gregkh-pci-pci-move-pci_dev_put-outside-a-spinlock.patch
+gregkh-pci-acpiphp-add-new-bus-to-acpi.patch
+gregkh-pci-acpi-export-acpi_bus_trim.patch
+gregkh-pci-acpiphp-add-dock-event-handling.patch
+gregkh-pci-acpi-remove-dock-event-handling-from-ibm_acpi.patch
+gregkh-pci-acpiphp-slot-management-fix-v4.patch
PCI tree updates
+revert-gregkh-pci-x86-pci-domain-support-the-meat.patch
+gregkh-pci-altix-msi-support-git-ia64-fix.patch
Fix up things in the PCI tree
+axnet_cs-support-amb8110.patch
New device support
+net-socket-timestamp-32-bit-handler-for-64-bit-kernel-fix.patch
Fix net-socket-timestamp-32-bit-handler-for-64-bit-kernel.patch
+git-sparc64-build-fix.patch
Fix git-sparc64.patch
+gregkh-usb-usb-unusual_devs-entry-for-lyra-rca-rd1080.patch
+gregkh-usb-usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch
+gregkh-usb-usb-gadget-rndis-fix-alloc-bug.patch
+gregkh-usb-ub-use-kzalloc.patch
+gregkh-usb-usb-gadget-driver-section-fixups.patch
+gregkh-usb-usb-ethernet-gadget-driver-section-fixups.patch
+gregkh-usb-usb-visor.c-id-for-gspda-smartphone.patch
+gregkh-usb-usb-fix-warning-in-drivers-usb-media-ov511.c.patch
+gregkh-usb-usb-zc0301-driver-updates.patch
+gregkh-usb-usb-credits-add-credits-about-the-zc0301-and-et61x51-usb-drivers.patch
USB tree updates
+slab-remove-slab_no_reap-option.patch
+slab-remove-slab_no_reap-option-fix.patch
+on_each_cpu-disable-local-interupts.patch
+slab-use-on_each_cpu.patch
+slab-node-rotor-for-freeing-alien-caches-and-remote-per-cpu-pages.patch
+slab-node-rotor-for-freeing-alien-caches-and-remote-per-cpu-pages-fix.patch
slab cleanups and NUMA tweak
+selinux-disable-automatic-labeling-of-new-inodes-when.patch
+selinuxfs-cleanups-fix-hard-link-count.patch
+selinuxfs-cleanups-use-sel_make_dir.patch
+selinuxfs-cleanups-sel_fill_super-exit-path.patch
+selinuxfs-cleanups-sel_make_bools.patch
+selinuxfs-cleanups-sel_make_avc_files.patch
SELinux updates
+i386-dont-let-ptrace-set-the-nested-task-bit.patch
+i386-let-signal-handlers-set-the-resume-flag.patch
+x86-early-printk-handling-fixes.patch
+register-the-boot-cpu-in-the-cpu-maps-earlier.patch
+register-the-boot-cpu-in-the-cpu-maps-earlier-fix.patch
+i386-pass-proper-trap-numbers-to-die-chain-handlers.patch
+i386-actively-synchronize-vmalloc-area-when-registering-certain-callbacks.patch
+i386-actively-synchronize-vmalloc-area-when-registering-certain-callbacks-tidy.patch
+i386-fix-uses-of-user_mode-vs-user_mode_vm.patch
+fix-elf-entry-point-i386.patch
+i386-fix-singlestep-through-an-int80-syscall.patch
x86 updates
+swsusp-documentation-fix.patch
swsusp documentation
-pm-add-state-field-to-pm_message_t-to-hold-actual.patch
-pm-respect-the-actual-device-power-states-in-sysfs.patch
-pm-minor-updates-to-core-suspend-resume-functions.patch
-pm-make-pci_choose_state-use-the-real-device.patch
Dropped due to bug.
+pm-print-name-of-failed-suspend-function.patch
PM debugging aid.
+remove-kernel-power-pmcpm_unregister.patch
Cleanup
-dasd-backout-dasd_eer-module.patch
The eer module got deleted.
-register-sysfs-device-for-lp-devices.patch
Buggy, dropped.
-timer-irq-driven-soft-watchdog-percpu-race-fix.patch
-timer-irq-driven-soft-watchdog-percpu-fix.patch
-timer-irq-driven-soft-watchdog-boot-fix.patch
Folded into timer-irq-driven-soft-watchdog-cleanups.patch
+softlockup-detection-vs-cpu-hotplug.patch
+timer-irq-driven-soft-watchdog-cleanups-update.patch
Update it some more.
+decrapify-asm-generic-localh.patch
Use atomic64_t for default local_t implementation
+fs-inodec-make-iprune_mutex-static.patch
Cleanup
+reiserfs-fix-transaction-overflowing.patch
reiser3 fix
+introduce-fmode_exec-file-flag.patch
A hint for distributed filesystems.
+add-lookup_instantiate_filp-usage-warning.patch
Comment update
+isdn-fix-copy_to_user-unused-result-warning-in-isdn_ppp.patch
Warning fix
+time_interpolator-use-readq_relaxed-instead-of-readq.patch
Microoptimisation
+copy_process-cleanup-bad_fork_cleanup_sighand.patch
+copy_process-cleanup-bad_fork_cleanup_signal.patch
+cleanup-__exit_signal.patch
+rename-__exit_sighand-to-cleanup_sighand.patch
+move-__exit_signal-to-kernel-exitc.patch
+revert-optimize-sys_times-for-a-single-thread-process.patch
+do-__unhash_process-under-siglock.patch
+sys_times-dont-take-tasklist_lock.patch
+relax-sig_needs_tasklist.patch
+do_signal_stop-dont-take-tasklist_lock.patch
+do_group_exit-dont-take-tasklist_lock.patch
+do_sigaction-dont-take-tasklist_lock.patch
More core process/pid/thread updates from Oleg.
+autofs4-add-new-packet-type-for-v5-communications-fix.patch
Fix autofs4-add-new-packet-type-for-v5-communications.patch
-time-reduced-ntp-rework-part-1-update.patch
+time-reduced-ntp-rework-part-1-fix-adjtimeadj.patch
+time-reduced-ntp-rework-part-2-fix-adjtimeadj.patch
+time-clocksource-infrastructure-remove-nsec_t.patch
+time-generic-timekeeping-infrastructure-remove-nsec_t.patch
+time-generic-timekeeping-infrastructure-fix-ntp_synced.patch
+time-generic-timekeeping-infrastructure-wall_offset-helper-cleanup.patch
+time-i386-conversion-part-3-remove-nsec_t.patch
+time-i386-conversion-part-3-backout-pmtmr-changes.patch
-time-i386-conversion-part-5-acpi-pm-variable-renaming-and-config-change.patch
-time-i386-conversion-part-5-acpi-pm-variable-renaming-and-config-change-x86_64-fix.patch
+time-i386-conversion-part-4-del-timer_tscc.patch
+time-i386-clocksource-drivers-backout-pmtmr-changes.patch
Various updates, fixes and cleanups for the time management patches in -mm.
+sched-smpnice-apply-review-suggestions.patch
Tweaks for sched-implement-smpnice.patch
+frv-remove-unnecessary-ampersand.patch
+function-typo-fixes.patch
+um-fix-undefined-reference-to-hweight32.patch
+arm-fix-undefined-reference-to-generic_fls.patch
+bitops-generic-test_and_setclearchange_bit-fix.patch
+bitops-generic-hweight6432168-fix.patch
+bitops-m68k-use-generic-bitops-fix.patch
+bitops-ppc-use-generic-bitops.patch
+remove-zone_mem_map.patch
Various updates related to the bitops consolidation code in -mm.
+ia64-add-ptr-to-compatpatch.patch
+s390-add-ptr-compatpatch.patch
+parisc-add-ptr-compatpatch.patch
+mips-add-ptr-compatpatch.patch
Various archtectures need ptr_to_compat() for the lightweight futex patch.
+lightweight-robust-futexes-docs-update.patch
+lightweight-robust-futexes-i386-fix.patch
+lightweight-robust-futexes-x86_64-fix.patch
Updates to the futex patches
+unify-pfn_to_page-sparc64-pfn_to_page-fix.patch
Fix unify-pfn_to_page-sparc64-pfn_to_page.patch
+notifier-chain-update-api-changes.patch
+notifier-chain-update-api-changes-register-atomic_notifiers-in-atomic-context.patch
+notifier-chain-update-api-changes-export-new-notifier-chain-routines-as-gpl.patch
+notifier-chain-update-api-changes-avoid-calling-down_read-and-down_write-during-startup.patch
+notifier-chain-update-simple-definition-changes.patch
+notifier-chain-update-remove-unneeded-protection.patch
+notifier-chain-update-remove-unneeded-protection-the-idle-notifier-chain-should-be-atomic.patch
+notifier-chain-update-die_chain-changes.patch
+notifier-chain-update-dont-unregister-yourself.patch
+notifier-chain-update-dont-unregister-yourself-fix.patch
+notifier-chain-update-changes-to-dcdbasc.patch
+notifier-chain-update-update-usb_notify.patch
+notifier-chain-update-remaining-changes-for-new-api.patch
Notifier chain rework.
+rtc-subsystem-class.patch
+rtc-subsystem-arm-cleanup.patch
+rtc-subsystem-i2c-cleanup.patch
+rtc-subsystem-sysfs-interface.patch
+rtc-subsystem-proc-interface.patch
+rtc-subsystem-dev-interface.patch
+rtc-subsystem-x1205-driver.patch
+rtc-subsystem-test-device-driver.patch
+rtc-subsystem-ds1672-driver.patch
+rtc-subsystem-pcf8563-driver.patch
+rtc-subsystem-rs5c372-driver.patch
rtc subsystem rework. These patches are being updated.
+fbdev-framebuffer-driver-for-geode-gx-warning-fix.patch
Fix warning in fbdev-framebuffer-driver-for-geode-gx-update.patch
+au1200fb-alchemy-au1200-framebuffer-driver.patch
New framebuffer driver
+fbdev-make-bios-edid-reading-configurable.patch
Fix boot-time stall due to EDID probing.
+acpi-identify-which-device-is-not-power-manageable.patch
More useful ACPI warning message
All 1149 patches:
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/patch-list
^ permalink raw reply [flat|nested] 34+ messages in thread* [-mm PATCH] mips: fixed collision of rtc function name 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton @ 2006-02-24 16:27 ` Yoichi Yuasa 2006-02-25 13:48 ` Atsushi Nemoto 2006-02-24 23:52 ` 2.6.16-rc4-mm2 Sam Ravnborg ` (11 subsequent siblings) 12 siblings, 1 reply; 34+ messages in thread From: Yoichi Yuasa @ 2006-02-24 16:27 UTC (permalink / raw) To: Andrew Morton; +Cc: yoichi_yuasa, linux-kernel, Ralf Baechle Hi, This patch has fixed the collision of rtc function name on 2.6.16-rc4-mm2. Yoichi Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> diff -pruN -X dontdiff mm2-orig/arch/mips/ddb5xxx/common/rtc_ds1386.c mm2/arch/mips/ddb5xxx/common/rtc_ds1386.c --- mm2-orig/arch/mips/ddb5xxx/common/rtc_ds1386.c 2006-02-25 01:08:51.063134250 +0900 +++ mm2/arch/mips/ddb5xxx/common/rtc_ds1386.c 2006-02-25 00:58:31.150596000 +0900 @@ -165,6 +165,6 @@ rtc_ds1386_init(unsigned long base) WRITE_RTC(0xB, byte); /* set the function pointers */ - rtc_get_time = rtc_ds1386_get_time; - rtc_set_time = rtc_ds1386_set_time; + rtc_mips_get_time = rtc_ds1386_get_time; + rtc_mips_set_time = rtc_ds1386_set_time; } diff -pruN -X dontdiff mm2-orig/arch/mips/dec/time.c mm2/arch/mips/dec/time.c --- mm2-orig/arch/mips/dec/time.c 2006-02-25 01:08:51.211143500 +0900 +++ mm2/arch/mips/dec/time.c 2006-02-25 00:59:33.010462000 +0900 @@ -193,8 +193,8 @@ static void dec_ioasic_hpt_init(unsigned void __init dec_time_init(void) { - rtc_get_time = dec_rtc_get_time; - rtc_set_mmss = dec_rtc_set_mmss; + rtc_mips_get_time = dec_rtc_get_time; + rtc_mips_set_mmss = dec_rtc_set_mmss; mips_timer_state = dec_timer_state; mips_timer_ack = dec_timer_ack; diff -pruN -X dontdiff mm2-orig/arch/mips/ite-boards/generic/time.c mm2/arch/mips/ite-boards/generic/time.c --- mm2-orig/arch/mips/ite-boards/generic/time.c 2006-02-25 01:08:51.315150000 +0900 +++ mm2/arch/mips/ite-boards/generic/time.c 2006-02-25 00:59:57.503992750 +0900 @@ -227,8 +227,8 @@ void __init it8172_time_init(void) local_irq_restore(flags); - rtc_get_time = it8172_rtc_get_time; - rtc_set_time = it8172_rtc_set_time; + rtc_mips_get_time = it8172_rtc_get_time; + rtc_mips_set_time = it8172_rtc_set_time; } #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) diff -pruN -X dontdiff mm2-orig/arch/mips/jmr3927/common/rtc_ds1742.c mm2/arch/mips/jmr3927/common/rtc_ds1742.c --- mm2-orig/arch/mips/jmr3927/common/rtc_ds1742.c 2006-02-25 01:08:51.319150250 +0900 +++ mm2/arch/mips/jmr3927/common/rtc_ds1742.c 2006-02-25 01:01:59.797301250 +0900 @@ -159,8 +159,8 @@ rtc_ds1742_init(unsigned long base) db_assert((rtc_base & 0xe0000000) == KSEG1); /* set the function pointers */ - rtc_get_time = rtc_ds1742_get_time; - rtc_set_time = rtc_ds1742_set_time; + rtc_mips_get_time = rtc_ds1742_get_time; + rtc_mips_set_time = rtc_ds1742_set_time; /* clear oscillator stop bit */ CMOS_WRITE(RTC_READ, RTC_CONTROL); diff -pruN -X dontdiff mm2-orig/arch/mips/kernel/time.c mm2/arch/mips/kernel/time.c --- mm2-orig/arch/mips/kernel/time.c 2006-02-25 01:08:51.471159750 +0900 +++ mm2/arch/mips/kernel/time.c 2006-02-25 00:53:17.975023750 +0900 @@ -65,9 +65,9 @@ static int null_rtc_set_time(unsigned lo return 0; } -unsigned long (*rtc_get_time)(void) = null_rtc_get_time; -int (*rtc_set_time)(unsigned long) = null_rtc_set_time; -int (*rtc_set_mmss)(unsigned long); +unsigned long (*rtc_mips_get_time)(void) = null_rtc_get_time; +int (*rtc_mips_set_time)(unsigned long) = null_rtc_set_time; +int (*rtc_mips_set_mmss)(unsigned long); /* usecs per counter cycle, shifted to left by 32 bits */ @@ -437,7 +437,7 @@ irqreturn_t timer_interrupt(int irq, voi /* * If we have an externally synchronized Linux clock, then update - * CMOS clock accordingly every ~11 minutes. rtc_set_time() has to be + * CMOS clock accordingly every ~11 minutes. rtc_mips_set_time() has to be * called as close as possible to 500 ms before the new second starts. */ write_seqlock(&xtime_lock); @@ -445,7 +445,7 @@ irqreturn_t timer_interrupt(int irq, voi xtime.tv_sec > last_rtc_update + 660 && (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { - if (rtc_set_mmss(xtime.tv_sec) == 0) { + if (rtc_mips_set_mmss(xtime.tv_sec) == 0) { last_rtc_update = xtime.tv_sec; } else { /* do it again in 60 s */ @@ -562,7 +562,7 @@ asmlinkage void ll_local_timer_interrupt * b) (optional) calibrate and set the mips_hpt_frequency * (only needed if you intended to use fixed_rate_gettimeoffset * or use cpu counter as timer interrupt source) - * 2) setup xtime based on rtc_get_time(). + * 2) setup xtime based on rtc_mips_get_time(). * 3) choose a appropriate gettimeoffset routine. * 4) calculate a couple of cached variables for later usage * 5) board_timer_setup() - @@ -630,10 +630,10 @@ void __init time_init(void) if (board_time_init) board_time_init(); - if (!rtc_set_mmss) - rtc_set_mmss = rtc_set_time; + if (!rtc_mips_set_mmss) + rtc_mips_set_mmss = rtc_mips_set_time; - xtime.tv_sec = rtc_get_time(); + xtime.tv_sec = rtc_mips_get_time(); xtime.tv_nsec = 0; set_normalized_timespec(&wall_to_monotonic, @@ -769,8 +769,8 @@ void to_tm(unsigned long tim, struct rtc EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(to_tm); -EXPORT_SYMBOL(rtc_set_time); -EXPORT_SYMBOL(rtc_get_time); +EXPORT_SYMBOL(rtc_mips_set_time); +EXPORT_SYMBOL(rtc_mips_get_time); unsigned long long sched_clock(void) { diff -pruN -X dontdiff mm2-orig/arch/mips/lasat/setup.c mm2/arch/mips/lasat/setup.c --- mm2-orig/arch/mips/lasat/setup.c 2006-02-25 01:08:51.479160250 +0900 +++ mm2/arch/mips/lasat/setup.c 2006-02-25 01:02:31.199556750 +0900 @@ -175,8 +175,8 @@ void __init plat_setup(void) #ifdef CONFIG_DS1603 ds1603 = &ds_defs[mips_machtype]; - rtc_get_time = ds1603_read; - rtc_set_time = ds1603_set; + rtc_mips_get_time = ds1603_read; + rtc_mips_set_time = ds1603_set; #endif #ifdef DYNAMIC_SERIAL_INIT diff -pruN -X dontdiff mm2-orig/arch/mips/mips-boards/atlas/atlas_setup.c mm2/arch/mips/mips-boards/atlas/atlas_setup.c --- mm2-orig/arch/mips/mips-boards/atlas/atlas_setup.c 2006-02-25 01:08:51.555165000 +0900 +++ mm2/arch/mips/mips-boards/atlas/atlas_setup.c 2006-02-25 01:05:47.797507500 +0900 @@ -65,7 +65,7 @@ void __init plat_setup(void) board_time_init = mips_time_init; board_timer_setup = mips_timer_setup; - rtc_get_time = mips_rtc_get_time; + rtc_mips_get_time = mips_rtc_get_time; } static void __init serial_init(void) diff -pruN -X dontdiff mm2-orig/arch/mips/mips-boards/malta/malta_setup.c mm2/arch/mips/mips-boards/malta/malta_setup.c --- mm2-orig/arch/mips/mips-boards/malta/malta_setup.c 2006-02-25 01:08:51.559165250 +0900 +++ mm2/arch/mips/mips-boards/malta/malta_setup.c 2006-02-25 01:06:28.555668000 +0900 @@ -225,5 +225,5 @@ void __init plat_setup(void) board_time_init = mips_time_init; board_timer_setup = mips_timer_setup; - rtc_get_time = mips_rtc_get_time; + rtc_mips_get_time = mips_rtc_get_time; } diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/jaguar_atx/setup.c mm2/arch/mips/momentum/jaguar_atx/setup.c --- mm2-orig/arch/mips/momentum/jaguar_atx/setup.c 2006-02-25 01:08:51.607168250 +0900 +++ mm2/arch/mips/momentum/jaguar_atx/setup.c 2006-02-25 01:03:37.534522500 +0900 @@ -228,8 +228,8 @@ void momenco_time_init(void) mips_hpt_frequency = cpu_clock / 2; board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } static struct resource mv_pci_io_mem0_resource = { diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/ocelot_3/setup.c mm2/arch/mips/momentum/ocelot_3/setup.c --- mm2-orig/arch/mips/momentum/ocelot_3/setup.c 2006-02-25 01:08:51.611168500 +0900 +++ mm2/arch/mips/momentum/ocelot_3/setup.c 2006-02-25 01:04:05.526270750 +0900 @@ -215,8 +215,8 @@ void momenco_time_init(void) mips_hpt_frequency = cpu_clock / 2; board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } /* diff -pruN -X dontdiff mm2-orig/arch/mips/momentum/ocelot_c/setup.c mm2/arch/mips/momentum/ocelot_c/setup.c --- mm2-orig/arch/mips/momentum/ocelot_c/setup.c 2006-02-25 01:08:51.639170250 +0900 +++ mm2/arch/mips/momentum/ocelot_c/setup.c 2006-02-25 01:04:30.779217750 +0900 @@ -226,8 +226,8 @@ void momenco_time_init(void) printk("momenco_time_init cpu_clock=%d\n", cpu_clock); board_timer_setup = momenco_timer_setup; - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; } void __init plat_setup(void) diff -pruN -X dontdiff mm2-orig/arch/mips/pmc-sierra/yosemite/setup.c mm2/arch/mips/pmc-sierra/yosemite/setup.c --- mm2-orig/arch/mips/pmc-sierra/yosemite/setup.c 2006-02-25 01:08:51.835182500 +0900 +++ mm2/arch/mips/pmc-sierra/yosemite/setup.c 2006-02-25 01:02:57.907866750 +0900 @@ -198,8 +198,8 @@ static void __init py_rtc_setup(void) if (!m48t37_base) printk(KERN_ERR "Mapping the RTC failed\n"); - rtc_get_time = m48t37y_get_time; - rtc_set_time = m48t37y_set_time; + rtc_mips_get_time = m48t37y_get_time; + rtc_mips_set_time = m48t37y_set_time; write_seqlock(&xtime_lock); xtime.tv_sec = m48t37y_get_time(); diff -pruN -X dontdiff mm2-orig/arch/mips/sgi-ip22/ip22-time.c mm2/arch/mips/sgi-ip22/ip22-time.c --- mm2-orig/arch/mips/sgi-ip22/ip22-time.c 2006-02-25 01:08:51.863184250 +0900 +++ mm2/arch/mips/sgi-ip22/ip22-time.c 2006-02-25 00:58:00.360671750 +0900 @@ -212,8 +212,8 @@ static void indy_timer_setup(struct irqa void __init ip22_time_init(void) { /* setup hookup functions */ - rtc_get_time = indy_rtc_get_time; - rtc_set_time = indy_rtc_set_time; + rtc_mips_get_time = indy_rtc_get_time; + rtc_mips_set_time = indy_rtc_set_time; board_time_init = indy_time_init; board_timer_setup = indy_timer_setup; diff -pruN -X dontdiff mm2-orig/arch/mips/sgi-ip32/ip32-setup.c mm2/arch/mips/sgi-ip32/ip32-setup.c --- mm2-orig/arch/mips/sgi-ip32/ip32-setup.c 2006-02-25 01:08:51.991192250 +0900 +++ mm2/arch/mips/sgi-ip32/ip32-setup.c 2006-02-25 00:57:36.283167000 +0900 @@ -91,8 +91,8 @@ void __init plat_setup(void) { board_be_init = ip32_be_init; - rtc_get_time = mc146818_get_cmos_time; - rtc_set_mmss = mc146818_set_rtc_mmss; + rtc_mips_get_time = mc146818_get_cmos_time; + rtc_mips_set_mmss = mc146818_set_rtc_mmss; board_time_init = ip32_time_init; board_timer_setup = ip32_timer_setup; diff -pruN -X dontdiff mm2-orig/arch/mips/sibyte/swarm/setup.c mm2/arch/mips/sibyte/swarm/setup.c --- mm2-orig/arch/mips/sibyte/swarm/setup.c 2006-02-25 01:08:52.031194750 +0900 +++ mm2/arch/mips/sibyte/swarm/setup.c 2006-02-25 00:56:45.591999000 +0900 @@ -114,14 +114,14 @@ void __init plat_setup(void) if (xicor_probe()) { printk("swarm setup: Xicor 1241 RTC detected.\n"); - rtc_get_time = xicor_get_time; - rtc_set_time = xicor_set_time; + rtc_mips_get_time = xicor_get_time; + rtc_mips_set_time = xicor_set_time; } if (m41t81_probe()) { printk("swarm setup: M41T81 RTC detected.\n"); - rtc_get_time = m41t81_get_time; - rtc_set_time = m41t81_set_time; + rtc_mips_get_time = m41t81_get_time; + rtc_mips_set_time = m41t81_set_time; } printk("This kernel optimized for " diff -pruN -X dontdiff mm2-orig/arch/mips/sni/setup.c mm2/arch/mips/sni/setup.c --- mm2-orig/arch/mips/sni/setup.c 2006-02-25 01:08:52.035195000 +0900 +++ mm2/arch/mips/sni/setup.c 2006-02-25 00:56:12.565935000 +0900 @@ -164,8 +164,8 @@ static struct pci_controller sni_control static inline void sni_pcimt_time_init(void) { - rtc_get_time = mc146818_get_cmos_time; - rtc_set_time = mc146818_set_rtc_mmss; + rtc_mips_get_time = mc146818_get_cmos_time; + rtc_mips_set_time = mc146818_set_rtc_mmss; } void __init plat_setup(void) diff -pruN -X dontdiff mm2-orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c mm2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c --- mm2-orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2006-02-25 01:08:52.039195250 +0900 +++ mm2/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2006-02-25 00:55:37.163722500 +0900 @@ -1036,8 +1036,8 @@ toshiba_rbtx4927_time_init(void) #ifdef CONFIG_RTC_DS1742 - rtc_get_time = rtc_ds1742_get_time; - rtc_set_time = rtc_ds1742_set_time; + rtc_mips_get_time = rtc_ds1742_get_time; + rtc_mips_set_time = rtc_ds1742_set_time; TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, ":rtc_ds1742_init()-\n"); diff -pruN -X dontdiff mm2-orig/arch/mips/tx4938/common/rtc_rx5c348.c mm2/arch/mips/tx4938/common/rtc_rx5c348.c --- mm2-orig/arch/mips/tx4938/common/rtc_rx5c348.c 2006-02-25 01:08:52.043195500 +0900 +++ mm2/arch/mips/tx4938/common/rtc_rx5c348.c 2006-02-25 00:55:01.897518500 +0900 @@ -197,6 +197,6 @@ rtc_rx5c348_init(int chipid) srtc_24h = 1; /* set the function pointers */ - rtc_get_time = rtc_rx5c348_get_time; - rtc_set_time = rtc_rx5c348_set_time; + rtc_mips_get_time = rtc_rx5c348_get_time; + rtc_mips_set_time = rtc_rx5c348_set_time; } diff -pruN -X dontdiff mm2-orig/include/asm-mips/time.h mm2/include/asm-mips/time.h --- mm2-orig/include/asm-mips/time.h 2006-02-25 01:10:21.548789250 +0900 +++ mm2/include/asm-mips/time.h 2006-02-25 00:52:13.330983750 +0900 @@ -26,14 +26,14 @@ extern spinlock_t rtc_lock; /* * RTC ops. By default, they point to no-RTC functions. - * rtc_get_time - mktime(year, mon, day, hour, min, sec) in seconds. - * rtc_set_time - reverse the above translation and set time to RTC. - * rtc_set_mmss - similar to rtc_set_time, but only min and sec need + * rtc_mips_get_time - mktime(year, mon, day, hour, min, sec) in seconds. + * rtc_mips_set_time - reverse the above translation and set time to RTC. + * rtc_mips_set_mmss - similar to rtc_set_time, but only min and sec need * to be set. Used by RTC sync-up. */ -extern unsigned long (*rtc_get_time)(void); -extern int (*rtc_set_time)(unsigned long); -extern int (*rtc_set_mmss)(unsigned long); +extern unsigned long (*rtc_mips_get_time)(void); +extern int (*rtc_mips_set_time)(unsigned long); +extern int (*rtc_mips_set_mmss)(unsigned long); /* * Timer interrupt functions. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [-mm PATCH] mips: fixed collision of rtc function name 2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa @ 2006-02-25 13:48 ` Atsushi Nemoto 2006-02-26 22:43 ` Yoichi Yuasa 0 siblings, 1 reply; 34+ messages in thread From: Atsushi Nemoto @ 2006-02-25 13:48 UTC (permalink / raw) To: yoichi_yuasa; +Cc: akpm, linux-kernel, ralf >>>>> On Sat, 25 Feb 2006 01:27:21 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> said: yoichi> This patch has fixed the collision of rtc function name on yoichi> 2.6.16-rc4-mm2. You missed changes for include/asm-mips/rtc.h (an interface for genrtc driver) ? Or genrtc driver will be gone in the new RTC subsystem? --- Atsushi Nemoto ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [-mm PATCH] mips: fixed collision of rtc function name 2006-02-25 13:48 ` Atsushi Nemoto @ 2006-02-26 22:43 ` Yoichi Yuasa 2006-03-06 21:12 ` Ralf Baechle 0 siblings, 1 reply; 34+ messages in thread From: Yoichi Yuasa @ 2006-02-26 22:43 UTC (permalink / raw) To: Atsushi Nemoto; +Cc: yoichi_yuasa, akpm, linux-kernel, ralf On Sat, 25 Feb 2006 22:48:15 +0900 (JST) Atsushi Nemoto <anemo@mba.ocn.ne.jp> wrote: > >>>>> On Sat, 25 Feb 2006 01:27:21 +0900, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> said: > > yoichi> This patch has fixed the collision of rtc function name on > yoichi> 2.6.16-rc4-mm2. > > You missed changes for include/asm-mips/rtc.h (an interface for genrtc > driver) ? Or genrtc driver will be gone in the new RTC subsystem? The new RTC subsystem don't have genrtc driver. I think we should move from genrtc driver to the new RTC subsystem. Yoichi ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [-mm PATCH] mips: fixed collision of rtc function name 2006-02-26 22:43 ` Yoichi Yuasa @ 2006-03-06 21:12 ` Ralf Baechle 0 siblings, 0 replies; 34+ messages in thread From: Ralf Baechle @ 2006-03-06 21:12 UTC (permalink / raw) To: Yoichi Yuasa; +Cc: Atsushi Nemoto, akpm, linux-kernel On Mon, Feb 27, 2006 at 07:43:04AM +0900, Yoichi Yuasa wrote: > > yoichi> This patch has fixed the collision of rtc function name on > > yoichi> 2.6.16-rc4-mm2. > > > > You missed changes for include/asm-mips/rtc.h (an interface for genrtc > > driver) ? Or genrtc driver will be gone in the new RTC subsystem? > > The new RTC subsystem don't have genrtc driver. > I think we should move from genrtc driver to the new RTC subsystem. Definately preferable. I took the RTC subsystem patches as the reason to do some more cleaning in the MIPS RTC code. It's all quite disgusting but untangeling it is something one can easily burn a day or more on ... Ralf ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton 2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa @ 2006-02-24 23:52 ` Sam Ravnborg 2006-02-25 3:31 ` 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation Adrian Bunk ` (10 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Sam Ravnborg @ 2006-02-24 23:52 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > - Sam's new section-mismatch warning code detects 358 errors in my alpha > build, and a quick sampling indicates that they're real. Once this hits > mainline things will get somewhat messy. To put credits right I just ported the functionality of the two scripts developed by Keith Owens (reference_init.pl and reference_discarded.pl) to modpost so the check is run each time moduels are build. All errors introduced in the process are mine. The scripts are kept for now so one can double check. I had in mind to fix some of the easier ones but work is hindering it atm. For now it gives a warning when a drivers uses module_parm_array() and uses __initdata for parameters. This is a false warning - at least if sysfs attribute is '0'. Hope to look into this later. Sam ^ permalink raw reply [flat|nested] 34+ messages in thread
* 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton 2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa 2006-02-24 23:52 ` 2.6.16-rc4-mm2 Sam Ravnborg @ 2006-02-25 3:31 ` Adrian Bunk 2006-02-25 4:46 ` Alessandro Zummo 2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk ` (9 subsequent siblings) 12 siblings, 1 reply; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 3:31 UTC (permalink / raw) To: Andrew Morton, Alessandro Zummo; +Cc: linux-kernel, Greg KH, Russell King On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +rtc-subsystem-class.patch >... > rtc subsystem rework. These patches are being updated. >... Always building drivers/rtc/utils.o even if no RTC support is enabled seems to be a workaround for an issue that should instead be fixed properly: The code in e.g. fs/udf/udftime.c or drivers/scsi/ips.c has some overlaps with what you are adding (they are not doing exactly the same, but there are overlaps). We should have one common set of defines/inlines/functions dealing with all these time conversion, leap year, length of months/years etc. issues instead of adding one more implementation in this area. 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-25 3:31 ` 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation Adrian Bunk @ 2006-02-25 4:46 ` Alessandro Zummo 2006-02-25 13:10 ` Adrian Bunk 0 siblings, 1 reply; 34+ messages in thread From: Alessandro Zummo @ 2006-02-25 4:46 UTC (permalink / raw) To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, Greg KH, Russell King On Sat, 25 Feb 2006 04:31:18 +0100 Adrian Bunk <bunk@stusta.de> wrote: > Always building drivers/rtc/utils.o even if no RTC support is enabled > seems to be a workaround for an issue that should instead be fixed > properly: > > The code in e.g. fs/udf/udftime.c or drivers/scsi/ips.c has some > overlaps with what you are adding (they are not doing exactly the > same, but there are overlaps). > > We should have one common set of defines/inlines/functions dealing with > all these time conversion, leap year, length of months/years etc. issues > instead of adding one more implementation in this area. I agree. My idea was to place those routines in utils.o and then modify callers, like udftime.c and ips.c to use them. What is currently in utils.c has been gathered from files that were known to me, lice rtctime.c in the arm arch and some rtc drivers. Once deployed, it will be easier to find and convert similar routines.y -- Best regards, Alessandro Zummo, Tower Technologies - Turin, Italy http://www.towertech.it ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-25 4:46 ` Alessandro Zummo @ 2006-02-25 13:10 ` Adrian Bunk 2006-02-26 18:41 ` Alessandro Zummo 0 siblings, 1 reply; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:10 UTC (permalink / raw) To: Alessandro Zummo; +Cc: Andrew Morton, linux-kernel, Greg KH, Russell King On Sat, Feb 25, 2006 at 05:46:19AM +0100, Alessandro Zummo wrote: > On Sat, 25 Feb 2006 04:31:18 +0100 > Adrian Bunk <bunk@stusta.de> wrote: > > > Always building drivers/rtc/utils.o even if no RTC support is enabled > > seems to be a workaround for an issue that should instead be fixed > > properly: > > > > The code in e.g. fs/udf/udftime.c or drivers/scsi/ips.c has some > > overlaps with what you are adding (they are not doing exactly the > > same, but there are overlaps). > > > > We should have one common set of defines/inlines/functions dealing with > > all these time conversion, leap year, length of months/years etc. issues > > instead of adding one more implementation in this area. > > I agree. My idea was to place those routines in utils.o and then > modify callers, like udftime.c and ips.c to use them. What is currently > in utils.c has been gathered from files that were known to me, > lice rtctime.c in the arm arch and some rtc drivers. Once deployed, > it will be easier to find and convert similar routines.y Sounds good, but for generic functions, two adjustments are required: - move the code to lib/ - remove rtc_ prefixes from the functions > Best regards, > Alessandro Zummo, 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-25 13:10 ` Adrian Bunk @ 2006-02-26 18:41 ` Alessandro Zummo 2006-02-26 18:55 ` Adrian Bunk 0 siblings, 1 reply; 34+ messages in thread From: Alessandro Zummo @ 2006-02-26 18:41 UTC (permalink / raw) To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel, Greg KH, Russell King On Sat, 25 Feb 2006 14:10:25 +0100 Adrian Bunk <bunk@stusta.de> wrote: > > Sounds good, but for generic functions, two adjustments are required: > - move the code to lib/ > - remove rtc_ prefixes from the functions Moved. I'm not sure about renaming them.. the functions are: rtc_month_days rtc_time_to_tm rtc_valid_tm rtc_tm_to_time I think they make more sense with the rtc prefix -- Best regards, Alessandro Zummo, Tower Technologies - Turin, Italy http://www.towertech.it ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-26 18:41 ` Alessandro Zummo @ 2006-02-26 18:55 ` Adrian Bunk 2006-02-26 20:02 ` Russell King 0 siblings, 1 reply; 34+ messages in thread From: Adrian Bunk @ 2006-02-26 18:55 UTC (permalink / raw) To: Alessandro Zummo; +Cc: Andrew Morton, linux-kernel, Greg KH, Russell King On Sun, Feb 26, 2006 at 07:41:16PM +0100, Alessandro Zummo wrote: > On Sat, 25 Feb 2006 14:10:25 +0100 > Adrian Bunk <bunk@stusta.de> wrote: > > > > > Sounds good, but for generic functions, two adjustments are required: > > - move the code to lib/ > > - remove rtc_ prefixes from the functions > > Moved. I'm not sure about renaming them.. > > the functions are: > > rtc_month_days > rtc_time_to_tm > rtc_valid_tm > rtc_tm_to_time > > I think they make more sense with the rtc prefix None of these functions is in any way specicific to RTC drivers. > Best regards, > Alessandro Zummo, 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-26 18:55 ` Adrian Bunk @ 2006-02-26 20:02 ` Russell King 2006-03-03 22:26 ` Adrian Bunk 0 siblings, 1 reply; 34+ messages in thread From: Russell King @ 2006-02-26 20:02 UTC (permalink / raw) To: Adrian Bunk; +Cc: Alessandro Zummo, Andrew Morton, linux-kernel, Greg KH On Sun, Feb 26, 2006 at 07:55:18PM +0100, Adrian Bunk wrote: > On Sun, Feb 26, 2006 at 07:41:16PM +0100, Alessandro Zummo wrote: > > On Sat, 25 Feb 2006 14:10:25 +0100 > > Adrian Bunk <bunk@stusta.de> wrote: > > > > > > > > Sounds good, but for generic functions, two adjustments are required: > > > - move the code to lib/ > > > - remove rtc_ prefixes from the functions > > > > Moved. I'm not sure about renaming them.. > > > > the functions are: > > > > rtc_month_days > > rtc_time_to_tm > > rtc_valid_tm > > rtc_tm_to_time > > > > I think they make more sense with the rtc prefix > > None of these functions is in any way specicific to RTC drivers. Doesn't having them take a struct rtc_time (which is different from struct tm) make them rather RTC specific? -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation 2006-02-26 20:02 ` Russell King @ 2006-03-03 22:26 ` Adrian Bunk 0 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-03-03 22:26 UTC (permalink / raw) To: Alessandro Zummo, Andrew Morton, linux-kernel, Greg KH On Sun, Feb 26, 2006 at 08:02:12PM +0000, Russell King wrote: > On Sun, Feb 26, 2006 at 07:55:18PM +0100, Adrian Bunk wrote: > > On Sun, Feb 26, 2006 at 07:41:16PM +0100, Alessandro Zummo wrote: > > > On Sat, 25 Feb 2006 14:10:25 +0100 > > > Adrian Bunk <bunk@stusta.de> wrote: > > > > > > > > > > > Sounds good, but for generic functions, two adjustments are required: > > > > - move the code to lib/ > > > > - remove rtc_ prefixes from the functions > > > > > > Moved. I'm not sure about renaming them.. > > > > > > the functions are: > > > > > > rtc_month_days > > > rtc_time_to_tm > > > rtc_valid_tm > > > rtc_tm_to_time > > > > > > I think they make more sense with the rtc prefix > > > > None of these functions is in any way specicific to RTC drivers. > > Doesn't having them take a struct rtc_time (which is different from > struct tm) make them rather RTC specific? You are right, it seems I was a bit blind... But in this case, it seems we don't need to build them unconditionally no matter whether RTC support is enabled in the kernel. > Russell King 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (2 preceding siblings ...) 2006-02-25 3:31 ` 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation Adrian Bunk @ 2006-02-25 3:38 ` Adrian Bunk 2006-02-25 7:10 ` Rusty Russell 2006-02-25 7:22 ` Andrew Morton 2006-02-25 3:47 ` oss/sonicvibes.c defines its own hweight32 Richard Knutsson ` (8 subsequent siblings) 12 siblings, 2 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 3:38 UTC (permalink / raw) To: Andrew Morton, Rusty Russell; +Cc: linux-kernel On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +remove-module_parm.patch >... > Current 2.6.16 queue. Some of these are a bit questionable at this stage. >... This causes the following compile error: <-- snip --> ... CC [M] drivers/isdn/hysdn/hysdn_net.o drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before 'int' drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before ',' token drivers/isdn/hysdn/hysdn_net.c:27: error: 'param_set_unsigned' undeclared here (not in a function) drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before 'int' drivers/isdn/hysdn/hysdn_net.c:27: error: 'param_get_unsigned' undeclared here (not in a function) make[3]: *** [drivers/isdn/hysdn/hysdn_net.o] Error 1 <-- snip --> 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error 2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk @ 2006-02-25 7:10 ` Rusty Russell 2006-02-25 7:22 ` Andrew Morton 1 sibling, 0 replies; 34+ messages in thread From: Rusty Russell @ 2006-02-25 7:10 UTC (permalink / raw) To: Adrian Bunk; +Cc: Andrew Morton, linux-kernel On Sat, 2006-02-25 at 04:38 +0100, Adrian Bunk wrote: > On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: > >... > > Changes since 2.6.16-rc4-mm1: > >... > > +remove-module_parm.patch > >... > > Current 2.6.16 queue. Some of these are a bit questionable at this stage. > >... > > This causes the following compile error: Thanks Adrian! The hysdn_net driver #defines uint to "unsigned int" in a header. Remove that: the typedefs in types.h have the same effect, without breaking "uint" module_param. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal linux-2.6.16-rc4/drivers/isdn/hysdn/hysdn_defs.h working-2.6.16-rc4-MODULE_PARM-remove/drivers/isdn/hysdn/hysdn_defs.h --- linux-2.6.16-rc4/drivers/isdn/hysdn/hysdn_defs.h 2005-08-29 14:39:36.000000000 +1000 +++ working-2.6.16-rc4-MODULE_PARM-remove/drivers/isdn/hysdn/hysdn_defs.h 2006-02-25 18:06:06.000000000 +1100 @@ -24,8 +24,6 @@ /* storage type definitions */ /****************************/ #define uchar unsigned char -#define uint unsigned int -#define ulong unsigned long #define word unsigned short #include "ince1pc.h" -- ccontrol: http://ozlabs.org/~rusty/ccontrol ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error 2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk 2006-02-25 7:10 ` Rusty Russell @ 2006-02-25 7:22 ` Andrew Morton 2006-02-25 7:56 ` Rusty Russell 1 sibling, 1 reply; 34+ messages in thread From: Andrew Morton @ 2006-02-25 7:22 UTC (permalink / raw) To: Adrian Bunk; +Cc: rusty, linux-kernel, Karsten Keil Adrian Bunk <bunk@stusta.de> wrote: > > On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: > >... > > Changes since 2.6.16-rc4-mm1: > >... > > +remove-module_parm.patch > >... > > Current 2.6.16 queue. Some of these are a bit questionable at this stage. > >... > > This causes the following compile error: > > <-- snip --> > > ... > CC [M] drivers/isdn/hysdn/hysdn_net.o > drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before 'int' > drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before ',' token > drivers/isdn/hysdn/hysdn_net.c:27: error: 'param_set_unsigned' undeclared here (not in a function) > drivers/isdn/hysdn/hysdn_net.c:27: error: syntax error before 'int' > drivers/isdn/hysdn/hysdn_net.c:27: error: 'param_get_unsigned' undeclared here (not in a function) > make[3]: *** [drivers/isdn/hysdn/hysdn_net.o] Error 1 That's a bit nasty. module_param(hynet_enable, uint, 0); module_param() does funny things with macros, and relies upon things like `uint' having a special-to-moduleparam.h meaning. But ISDN defines its own meaning for uint and trips up the moduleparam.h macros. Bad Rusty should have chosen less generic-sounding identifiers. Bad ISDN shouldn't have gone off and defined its own types, either. Kasrten, this nukes the hysdn custom types. Is it acceptable? drivers/isdn/hysdn/boardergo.c | 31 +++++------ drivers/isdn/hysdn/boardergo.h | 46 ++++++++-------- drivers/isdn/hysdn/hycapi.c | 2 drivers/isdn/hysdn/hysdn_boot.c | 28 +++++----- drivers/isdn/hysdn/hysdn_defs.h | 71 ++++++++++++-------------- drivers/isdn/hysdn/hysdn_init.c | 4 - drivers/isdn/hysdn/hysdn_net.c | 6 +- drivers/isdn/hysdn/hysdn_pof.h | 12 ++-- drivers/isdn/hysdn/hysdn_procconf.c | 14 ++--- drivers/isdn/hysdn/hysdn_proclog.c | 10 +-- drivers/isdn/hysdn/hysdn_sched.c | 11 ++-- drivers/isdn/hysdn/ince1pc.h | 18 +++--- 12 files changed, 127 insertions(+), 126 deletions(-) diff -puN drivers/isdn/hysdn/hysdn_defs.h~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_defs.h --- devel/drivers/isdn/hysdn/hysdn_defs.h~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_defs.h 2006-02-24 23:17:06.000000000 -0800 @@ -20,14 +20,6 @@ #include <linux/workqueue.h> #include <linux/skbuff.h> -/****************************/ -/* storage type definitions */ -/****************************/ -#define uchar unsigned char -#define uint unsigned int -#define ulong unsigned long -#define word unsigned short - #include "ince1pc.h" #ifdef CONFIG_HYSDN_CAPI @@ -147,18 +139,18 @@ typedef struct HYSDN_CARD { /* general variables for the cards */ int myid; /* own driver card id */ - uchar bus; /* pci bus the card is connected to */ - uchar devfn; /* slot+function bit encoded */ - word subsysid; /* PCI subsystem id */ - uchar brdtype; /* type of card */ - uint bchans; /* number of available B-channels */ - uint faxchans; /* number of available fax-channels */ - uchar mac_addr[6]; /* MAC Address read from card */ - uint irq; /* interrupt number */ - uint iobase; /* IO-port base address */ - ulong plxbase; /* PLX memory base */ - ulong membase; /* DPRAM memory base */ - ulong memend; /* DPRAM memory end */ + unsigned char bus; /* pci bus the card is connected to */ + unsigned char devfn; /* slot+function bit encoded */ + unsigned short subsysid;/* PCI subsystem id */ + unsigned char brdtype; /* type of card */ + unsigned int bchans; /* number of available B-channels */ + unsigned int faxchans; /* number of available fax-channels */ + unsigned char mac_addr[6];/* MAC Address read from card */ + unsigned int irq; /* interrupt number */ + unsigned int iobase; /* IO-port base address */ + unsigned long plxbase; /* PLX memory base */ + unsigned long membase; /* DPRAM memory base */ + unsigned long memend; /* DPRAM memory end */ void *dpram; /* mapped dpram */ int state; /* actual state of card -> CARD_STATE_** */ struct HYSDN_CARD *next; /* pointer to next card */ @@ -168,26 +160,26 @@ typedef struct HYSDN_CARD { void *procconf; /* pointer to procconf filesystem specific data */ /* debugging and logging */ - uchar err_log_state; /* actual error log state of the card */ - ulong debug_flags; /* tells what should be debugged and where */ + unsigned char err_log_state;/* actual error log state of the card */ + unsigned long debug_flags;/* tells what should be debugged and where */ void (*set_errlog_state) (struct HYSDN_CARD *, int); /* interrupt handler + interrupt synchronisation */ struct work_struct irq_queue; /* interrupt task queue */ - uchar volatile irq_enabled; /* interrupt enabled if != 0 */ - uchar volatile hw_lock; /* hardware is currently locked -> no access */ + unsigned char volatile irq_enabled;/* interrupt enabled if != 0 */ + unsigned char volatile hw_lock;/* hardware is currently locked -> no access */ /* boot process */ void *boot; /* pointer to boot private data */ - int (*writebootimg) (struct HYSDN_CARD *, uchar *, ulong); - int (*writebootseq) (struct HYSDN_CARD *, uchar *, int); + int (*writebootimg) (struct HYSDN_CARD *, unsigned char *, unsigned long); + int (*writebootseq) (struct HYSDN_CARD *, unsigned char *, int); int (*waitpofready) (struct HYSDN_CARD *); int (*testram) (struct HYSDN_CARD *); /* scheduler for data transfer (only async parts) */ - uchar async_data[256]; /* async data to be sent (normally for config) */ - word volatile async_len; /* length of data to sent */ - word volatile async_channel; /* channel number for async transfer */ + unsigned char async_data[256];/* async data to be sent (normally for config) */ + unsigned short volatile async_len;/* length of data to sent */ + unsigned short volatile async_channel;/* channel number for async transfer */ int volatile async_busy; /* flag != 0 sending in progress */ int volatile net_tx_busy; /* a network packet tx is in progress */ @@ -251,15 +243,18 @@ extern int ergo_inithardware(hysdn_card /* hysdn_boot.c */ extern int pof_write_close(hysdn_card *); /* close proc file after writing pof */ -extern int pof_write_open(hysdn_card *, uchar **); /* open proc file for writing pof */ +extern int pof_write_open(hysdn_card *, unsigned char **); /* open proc file for writing pof */ extern int pof_write_buffer(hysdn_card *, int); /* write boot data to card */ -extern int EvalSysrTokData(hysdn_card *, uchar *, int); /* Check Sysready Token Data */ +extern int EvalSysrTokData(hysdn_card *, unsigned char *, int); /* Check Sysready Token Data */ /* hysdn_sched.c */ -extern int hysdn_sched_tx(hysdn_card *, uchar *, word volatile *, word volatile *, - word); -extern int hysdn_sched_rx(hysdn_card *, uchar *, word, word); -extern int hysdn_tx_cfgline(hysdn_card *, uchar *, word); /* send one cfg line */ +extern int hysdn_sched_tx(hysdn_card *, unsigned char *, + unsigned short volatile *, unsigned short volatile *, + unsigned short); +extern int hysdn_sched_rx(hysdn_card *, unsigned char *, unsigned short, + unsigned short); +extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *, + unsigned short); /* send one cfg line */ /* hysdn_net.c */ extern unsigned int hynet_enable; @@ -269,14 +264,16 @@ extern int hysdn_net_release(hysdn_card extern char *hysdn_net_getname(hysdn_card *); /* get name of net interface */ extern void hysdn_tx_netack(hysdn_card *); /* acknowledge a packet tx */ extern struct sk_buff *hysdn_tx_netget(hysdn_card *); /* get next network packet */ -extern void hysdn_rx_netpkt(hysdn_card *, uchar *, word); /* rxed packet from network */ +extern void hysdn_rx_netpkt(hysdn_card *, unsigned char *, + unsigned short); /* rxed packet from network */ #ifdef CONFIG_HYSDN_CAPI extern unsigned int hycapi_enable; extern int hycapi_capi_create(hysdn_card *); /* create a new capi device */ extern int hycapi_capi_release(hysdn_card *); /* delete the device */ extern int hycapi_capi_stop(hysdn_card *card); /* suspend */ -extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len); +extern void hycapi_rx_capipkt(hysdn_card * card, unsigned char * buf, + unsigned short len); extern void hycapi_tx_capiack(hysdn_card * card); extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card); extern int hycapi_init(void); diff -puN drivers/isdn/hysdn/ince1pc.h~hysdn-remove-custom-types drivers/isdn/hysdn/ince1pc.h --- devel/drivers/isdn/hysdn/ince1pc.h~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/ince1pc.h 2006-02-24 23:17:06.000000000 -0800 @@ -62,7 +62,7 @@ * s. RotlCRC algorithm * * RotlCRC algorithm: - * ucSum= 0 1 uchar + * ucSum= 0 1 unsigned char * for all NonEndTokenChunk bytes: * ROTL(ucSum,1) rotate left by 1 * ucSum += Char; add current byte with swap around @@ -85,13 +85,13 @@ typedef struct ErrLogEntry_tag { -/*00 */ ulong ulErrType; +/*00 */ unsigned long ulErrType; -/*04 */ ulong ulErrSubtype; +/*04 */ unsigned long ulErrSubtype; -/*08 */ uchar ucTextSize; +/*08 */ unsigned char ucTextSize; - /*09 */ uchar ucText[ERRLOG_TEXT_SIZE]; + /*09 */ unsigned char ucText[ERRLOG_TEXT_SIZE]; /* ASCIIZ of len ucTextSize-1 */ /*40 */ @@ -111,13 +111,13 @@ typedef struct ErrLogEntry_tag { #define DPRAM_SPOOLER_DATA_SIZE 0x20 typedef struct DpramBootSpooler_tag { -/*00 */ uchar Len; +/*00 */ unsigned char Len; -/*01 */ volatile uchar RdPtr; +/*01 */ volatile unsigned char RdPtr; -/*02 */ uchar WrPtr; +/*02 */ unsigned char WrPtr; -/*03 */ uchar Data[DPRAM_SPOOLER_DATA_SIZE]; +/*03 */ unsigned char Data[DPRAM_SPOOLER_DATA_SIZE]; /*23 */ } tDpramBootSpooler; diff -puN drivers/isdn/hysdn/hysdn_net.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_net.c --- devel/drivers/isdn/hysdn/hysdn_net.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_net.c 2006-02-24 23:17:06.000000000 -0800 @@ -83,12 +83,12 @@ net_open(struct net_device *dev) /* Fill in the MAC-level header (if not already set) */ if (!card->mac_addr[0]) { - for (i = 0; i < ETH_ALEN - sizeof(ulong); i++) + for (i = 0; i < ETH_ALEN - sizeof(unsigned long); i++) dev->dev_addr[i] = 0xfc; if ((in_dev = dev->ip_ptr) != NULL) { struct in_ifaddr *ifa = in_dev->ifa_list; if (ifa != NULL) - memcpy(dev->dev_addr + (ETH_ALEN - sizeof(ulong)), &ifa->ifa_local, sizeof(ulong)); + memcpy(dev->dev_addr + (ETH_ALEN - sizeof(unsigned long)), &ifa->ifa_local, sizeof(unsigned long)); } } else memcpy(dev->dev_addr, card->mac_addr, ETH_ALEN); @@ -197,7 +197,7 @@ hysdn_tx_netack(hysdn_card * card) /* we got a packet from the network, go and queue it */ /*****************************************************/ void -hysdn_rx_netpkt(hysdn_card * card, uchar * buf, word len) +hysdn_rx_netpkt(hysdn_card * card, unsigned char *buf, unsigned short len) { struct net_local *lp = card->netif; struct sk_buff *skb; diff -puN drivers/isdn/hysdn/boardergo.c~hysdn-remove-custom-types drivers/isdn/hysdn/boardergo.c --- devel/drivers/isdn/hysdn/boardergo.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/boardergo.c 2006-02-24 23:17:06.000000000 -0800 @@ -38,8 +38,8 @@ ergo_interrupt(int intno, void *dev_id, { hysdn_card *card = dev_id; /* parameter from irq */ tErgDpram *dpr; - ulong flags; - uchar volatile b; + unsigned long flags; + unsigned char volatile b; if (!card) return IRQ_NONE; /* error -> spurious interrupt */ @@ -77,7 +77,7 @@ ergo_irq_bh(hysdn_card * card) { tErgDpram *dpr; int again; - ulong flags; + unsigned long flags; if (card->state != CARD_STATE_RUN) return; /* invalid call */ @@ -131,8 +131,8 @@ ergo_irq_bh(hysdn_card * card) static void ergo_stopcard(hysdn_card * card) { - ulong flags; - uchar val; + unsigned long flags; + unsigned char val; hysdn_net_release(card); /* first release the net device if existing */ #ifdef CONFIG_HYSDN_CAPI @@ -157,7 +157,7 @@ ergo_stopcard(hysdn_card * card) static void ergo_set_errlog_state(hysdn_card * card, int on) { - ulong flags; + unsigned long flags; if (card->state != CARD_STATE_RUN) { card->err_log_state = ERRLOG_STATE_OFF; /* must be off */ @@ -217,9 +217,10 @@ ergo_testram(hysdn_card * card) /* Negative return values are interpreted as errors. */ /*****************************************************************************/ static int -ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs) +ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf, + unsigned long offs) { - uchar *dst; + unsigned char *dst; tErgDpram *dpram; int cnt = (BOOT_IMG_SIZE >> 2); /* number of words to move and swap (byte order!) */ @@ -264,14 +265,14 @@ ergo_writebootimg(struct HYSDN_CARD *car /* case of errors a negative error value is returned. */ /********************************************************************************/ static int -ergo_writebootseq(struct HYSDN_CARD *card, uchar * buf, int len) +ergo_writebootseq(struct HYSDN_CARD *card, unsigned char *buf, int len) { tDpramBootSpooler *sp = (tDpramBootSpooler *) card->dpram; - uchar *dst; - uchar buflen; + unsigned char *dst; + unsigned char buflen; int nr_write; - uchar tmp_rdptr; - uchar wr_mirror; + unsigned char tmp_rdptr; + unsigned char wr_mirror; int i; if (card->debug_flags & LOG_POF_CARD) @@ -330,7 +331,7 @@ ergo_waitpofready(struct HYSDN_CARD *car { tErgDpram *dpr = card->dpram; /* pointer to DPRAM structure */ int timecnt = 10000 / 50; /* timeout is 10 secs max. */ - ulong flags; + unsigned long flags; int msg_size; int i; @@ -345,7 +346,7 @@ ergo_waitpofready(struct HYSDN_CARD *car if ((dpr->ToPcChannel != CHAN_SYSTEM) || (dpr->ToPcSize < MIN_RDY_MSG_SIZE) || (dpr->ToPcSize > MAX_RDY_MSG_SIZE) || - ((*(ulong *) dpr->ToPcBuf) != RDY_MAGIC)) + ((*(unsigned long *) dpr->ToPcBuf) != RDY_MAGIC)) break; /* an error occurred */ /* Check for additional data delivered during SysReady */ diff -puN drivers/isdn/hysdn/hycapi.c~hysdn-remove-custom-types drivers/isdn/hysdn/hycapi.c --- devel/drivers/isdn/hysdn/hycapi.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hycapi.c 2006-02-24 23:17:06.000000000 -0800 @@ -523,7 +523,7 @@ New nccis are created if necessary. *******************************************************************/ void -hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len) +hycapi_rx_capipkt(hysdn_card * card, unsigned char *buf, unsigned short len) { struct sk_buff *skb; hycapictrl_info *cinfo = card->hyctrlinfo; diff -puN drivers/isdn/hysdn/hysdn_boot.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_boot.c --- devel/drivers/isdn/hysdn/hysdn_boot.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_boot.c 2006-02-24 23:17:06.000000000 -0800 @@ -30,17 +30,17 @@ /* needed during boot and so allocated dynamically. */ /************************************************************/ struct boot_data { - word Cryptor; /* for use with Decrypt function */ - word Nrecs; /* records remaining in file */ - uchar pof_state; /* actual state of read handler */ - uchar is_crypted; /* card data is crypted */ + unsigned short Cryptor; /* for use with Decrypt function */ + unsigned short Nrecs; /* records remaining in file */ + unsigned char pof_state;/* actual state of read handler */ + unsigned char is_crypted;/* card data is crypted */ int BufSize; /* actual number of bytes bufferd */ int last_error; /* last occurred error */ - word pof_recid; /* actual pof recid */ - ulong pof_reclen; /* total length of pof record data */ - ulong pof_recoffset; /* actual offset inside pof record */ + unsigned short pof_recid;/* actual pof recid */ + unsigned long pof_reclen;/* total length of pof record data */ + unsigned long pof_recoffset;/* actual offset inside pof record */ union { - uchar BootBuf[BOOT_BUF_SIZE]; /* buffer as byte count */ + unsigned char BootBuf[BOOT_BUF_SIZE];/* buffer as byte count */ tPofRecHdr PofRecHdr; /* header for actual record/chunk */ tPofFileHdr PofFileHdr; /* header from POF file */ tPofTimeStamp PofTime; /* time information */ @@ -69,11 +69,11 @@ StartDecryption(struct boot_data *boot) static void DecryptBuf(struct boot_data *boot, int cnt) { - uchar *bufp = boot->buf.BootBuf; + unsigned char *bufp = boot->buf.BootBuf; while (cnt--) { boot->Cryptor = (boot->Cryptor >> 1) ^ ((boot->Cryptor & 1U) ? CRYPT_FEEDTERM : 0); - *bufp++ ^= (uchar) boot->Cryptor; + *bufp++ ^= (unsigned char)boot->Cryptor; } } /* DecryptBuf */ @@ -86,7 +86,7 @@ pof_handle_data(hysdn_card * card, int d { struct boot_data *boot = card->boot; /* pointer to boot specific data */ long l; - uchar *imgp; + unsigned char *imgp; int img_len; /* handle the different record types */ @@ -197,7 +197,7 @@ pof_write_buffer(hysdn_card * card, int break; } /* Setup the new state and vars */ - boot->Nrecs = (word) (boot->buf.PofFileHdr.N_PofRecs); /* limited to 65535 */ + boot->Nrecs = (unsigned short)(boot->buf.PofFileHdr.N_PofRecs); /* limited to 65535 */ boot->pof_state = POF_READ_TAG_HEAD; /* now start with single tags */ boot->last_error = sizeof(tPofRecHdr); /* new length */ break; @@ -268,7 +268,7 @@ pof_write_buffer(hysdn_card * card, int /* occurred. Additionally the pointer to the buffer data area is set on success */ /*******************************************************************************/ int -pof_write_open(hysdn_card * card, uchar ** bufp) +pof_write_open(hysdn_card * card, unsigned char **bufp) { struct boot_data *boot; /* pointer to boot specific data */ @@ -335,7 +335,7 @@ pof_write_close(hysdn_card * card) /* when POF has been booted. A return value of 0 is used if no error occurred. */ /*********************************************************************************/ int -EvalSysrTokData(hysdn_card * card, uchar * cp, int len) +EvalSysrTokData(hysdn_card *card, unsigned char *cp, int len) { u_char *p; u_char crc; diff -puN drivers/isdn/hysdn/hysdn_init.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_init.c --- devel/drivers/isdn/hysdn/hysdn_init.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_init.c 2006-02-24 23:17:06.000000000 -0800 @@ -41,8 +41,8 @@ hysdn_card *card_root = NULL; /* pointer /* the last entry contains all 0 */ /**********************************************/ static struct { - word subid; /* PCI sub id */ - uchar cardtyp; /* card type assigned */ + unsigned short subid; /* PCI sub id */ + unsigned char cardtyp; /* card type assigned */ } pci_subid_map[] = { { diff -puN drivers/isdn/hysdn/hysdn_procconf.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_procconf.c --- devel/drivers/isdn/hysdn/hysdn_procconf.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_procconf.c 2006-02-24 23:17:06.000000000 -0800 @@ -36,9 +36,9 @@ struct conf_writedata { int buf_size; /* actual number of bytes in the buffer */ int needed_size; /* needed size when reading pof */ int state; /* actual interface states from above constants */ - uchar conf_line[CONF_LINE_LEN]; /* buffered conf line */ - word channel; /* active channel number */ - uchar *pof_buffer; /* buffer when writing pof */ + unsigned char conf_line[CONF_LINE_LEN]; /* buffered conf line */ + unsigned short channel; /* active channel number */ + unsigned char *pof_buffer; /* buffer when writing pof */ }; /***********************************************************************/ @@ -49,7 +49,7 @@ struct conf_writedata { static int process_line(struct conf_writedata *cnf) { - uchar *cp = cnf->conf_line; + unsigned char *cp = cnf->conf_line; int i; if (cnf->card->debug_flags & LOG_CNF_LINE) @@ -92,7 +92,7 @@ hysdn_conf_write(struct file *file, cons { struct conf_writedata *cnf; int i; - uchar ch, *cp; + unsigned char ch, *cp; if (!count) return (0); /* nothing to handle */ @@ -390,7 +390,7 @@ int hysdn_procconf_init(void) { hysdn_card *card; - uchar conf_name[20]; + unsigned char conf_name[20]; hysdn_proc_entry = proc_mkdir(PROC_SUBDIR_NAME, proc_net); if (!hysdn_proc_entry) { @@ -423,7 +423,7 @@ void hysdn_procconf_release(void) { hysdn_card *card; - uchar conf_name[20]; + unsigned char conf_name[20]; card = card_root; /* start with first card */ while (card) { diff -puN drivers/isdn/hysdn/hysdn_proclog.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_proclog.c --- devel/drivers/isdn/hysdn/hysdn_proclog.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_proclog.c 2006-02-24 23:17:06.000000000 -0800 @@ -28,7 +28,7 @@ static void put_log_buffer(hysdn_card * /*************************************************/ struct log_data { struct log_data *next; - ulong usage_cnt; /* number of files still to work */ + unsigned long usage_cnt;/* number of files still to work */ void *proc_ctrl; /* pointer to own control procdata structure */ char log_start[2]; /* log string start (final len aligned by size) */ }; @@ -42,7 +42,7 @@ struct procdata { struct log_data *log_head, *log_tail; /* head and tail for queue */ int if_used; /* open count for interface */ int volatile del_lock; /* lock for delete operations */ - uchar logtmp[LOG_MAX_LINELEN]; + unsigned char logtmp[LOG_MAX_LINELEN]; wait_queue_head_t rd_queue; }; @@ -153,9 +153,9 @@ put_log_buffer(hysdn_card * card, char * static ssize_t hysdn_log_write(struct file *file, const char __user *buf, size_t count, loff_t * off) { - ulong u = 0; + unsigned long u = 0; int found = 0; - uchar *cp, valbuf[128]; + unsigned char *cp, valbuf[128]; long base = 10; hysdn_card *card = (hysdn_card *) file->private_data; @@ -249,7 +249,7 @@ hysdn_log_open(struct inode *ino, struct { hysdn_card *card; struct procdata *pd = NULL; - ulong flags; + unsigned long flags; lock_kernel(); card = card_root; diff -puN drivers/isdn/hysdn/hysdn_sched.c~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_sched.c --- devel/drivers/isdn/hysdn/hysdn_sched.c~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_sched.c 2006-02-24 23:18:06.000000000 -0800 @@ -30,7 +30,8 @@ /* to keep the data until later. */ /*****************************************************************************/ int -hysdn_sched_rx(hysdn_card * card, uchar * buf, word len, word chan) +hysdn_sched_rx(hysdn_card *card, unsigned char *buf, unsigned short len, + unsigned short chan) { switch (chan) { @@ -72,7 +73,9 @@ hysdn_sched_rx(hysdn_card * card, uchar /* sending. */ /*****************************************************************************/ int -hysdn_sched_tx(hysdn_card * card, uchar * buf, word volatile *len, word volatile *chan, word maxlen) +hysdn_sched_tx(hysdn_card *card, unsigned char *buf, + unsigned short volatile *len, unsigned short volatile *chan, + unsigned short maxlen) { struct sk_buff *skb; @@ -145,10 +148,10 @@ hysdn_sched_tx(hysdn_card * card, uchar /* are to be sent and this happens very seldom. */ /*****************************************************************************/ int -hysdn_tx_cfgline(hysdn_card * card, uchar * line, word chan) +hysdn_tx_cfgline(hysdn_card *card, unsigned char *line, unsigned short chan) { int cnt = 50; /* timeout intervalls */ - ulong flags; + unsigned long flags; if (card->debug_flags & LOG_SCHED_ASYN) hysdn_addlog(card, "async tx-cfg chan=%d len=%d", chan, strlen(line) + 1); diff -puN drivers/isdn/hysdn/boardergo.h~hysdn-remove-custom-types drivers/isdn/hysdn/boardergo.h --- devel/drivers/isdn/hysdn/boardergo.h~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/boardergo.h 2006-02-24 23:17:06.000000000 -0800 @@ -23,36 +23,36 @@ /* following DPRAM layout copied from OS2-driver boarderg.h */ typedef struct ErgDpram_tag { -/*0000 */ uchar ToHyBuf[ERG_TO_HY_BUF_SIZE]; -/*0E00 */ uchar ToPcBuf[ERG_TO_PC_BUF_SIZE]; +/*0000 */ unsigned char ToHyBuf[ERG_TO_HY_BUF_SIZE]; +/*0E00 */ unsigned char ToPcBuf[ERG_TO_PC_BUF_SIZE]; - /*1C00 */ uchar bSoftUart[SIZE_RSV_SOFT_UART]; + /*1C00 */ unsigned char bSoftUart[SIZE_RSV_SOFT_UART]; /* size 0x1B0 */ - /*1DB0 *//* tErrLogEntry */ uchar volatile ErrLogMsg[64]; + /*1DB0 *//* tErrLogEntry */ unsigned char volatile ErrLogMsg[64]; /* size 64 bytes */ - /*1DB0 ulong ulErrType; */ - /*1DB4 ulong ulErrSubtype; */ - /*1DB8 ulong ucTextSize; */ - /*1DB9 ulong ucText[ERRLOG_TEXT_SIZE]; *//* ASCIIZ of len ucTextSize-1 */ + /*1DB0 unsigned long ulErrType; */ + /*1DB4 unsigned long ulErrSubtype; */ + /*1DB8 unsigned long ucTextSize; */ + /*1DB9 unsigned long ucText[ERRLOG_TEXT_SIZE]; *//* ASCIIZ of len ucTextSize-1 */ /*1DF0 */ -/*1DF0 */ word volatile ToHyChannel; -/*1DF2 */ word volatile ToHySize; - /*1DF4 */ uchar volatile ToHyFlag; +/*1DF0 */ unsigned short volatile ToHyChannel; +/*1DF2 */ unsigned short volatile ToHySize; + /*1DF4 */ unsigned char volatile ToHyFlag; /* !=0: msg for Hy waiting */ - /*1DF5 */ uchar volatile ToPcFlag; + /*1DF5 */ unsigned char volatile ToPcFlag; /* !=0: msg for PC waiting */ -/*1DF6 */ word volatile ToPcChannel; -/*1DF8 */ word volatile ToPcSize; - /*1DFA */ uchar bRes1DBA[0x1E00 - 0x1DFA]; +/*1DF6 */ unsigned short volatile ToPcChannel; +/*1DF8 */ unsigned short volatile ToPcSize; + /*1DFA */ unsigned char bRes1DBA[0x1E00 - 0x1DFA]; /* 6 bytes */ -/*1E00 */ uchar bRestOfEntryTbl[0x1F00 - 0x1E00]; -/*1F00 */ ulong TrapTable[62]; - /*1FF8 */ uchar bRes1FF8[0x1FFB - 0x1FF8]; +/*1E00 */ unsigned char bRestOfEntryTbl[0x1F00 - 0x1E00]; +/*1F00 */ unsigned long TrapTable[62]; + /*1FF8 */ unsigned char bRes1FF8[0x1FFB - 0x1FF8]; /* low part of reset vetor */ -/*1FFB */ uchar ToPcIntMetro; +/*1FFB */ unsigned char ToPcIntMetro; /* notes: * - metro has 32-bit boot ram - accessing * ToPcInt and ToHyInt would be the same; @@ -65,16 +65,16 @@ typedef struct ErgDpram_tag { * so E1 side should NOT change this byte * when writing! */ -/*1FFC */ uchar volatile ToHyNoDpramErrLog; +/*1FFC */ unsigned char volatile ToHyNoDpramErrLog; /* note: ToHyNoDpramErrLog is used to inform * boot loader, not to use DPRAM based * ErrLog; when DOS driver is rewritten * this becomes obsolete */ -/*1FFD */ uchar bRes1FFD; - /*1FFE */ uchar ToPcInt; +/*1FFD */ unsigned char bRes1FFD; + /*1FFE */ unsigned char ToPcInt; /* E1_intclear; on CHAMP2: E1_intset */ - /*1FFF */ uchar ToHyInt; + /*1FFF */ unsigned char ToHyInt; /* E1_intset; on CHAMP2: E1_intclear */ } tErgDpram; diff -puN drivers/isdn/hysdn/hysdn_pof.h~hysdn-remove-custom-types drivers/isdn/hysdn/hysdn_pof.h --- devel/drivers/isdn/hysdn/hysdn_pof.h~hysdn-remove-custom-types 2006-02-24 23:17:06.000000000 -0800 +++ devel-akpm/drivers/isdn/hysdn/hysdn_pof.h 2006-02-24 23:17:06.000000000 -0800 @@ -47,20 +47,20 @@ /*--------------------------------------POF file record structs------------*/ typedef struct PofFileHdr_tag { /* Pof file header */ -/*00 */ ulong Magic __attribute__((packed)); -/*04 */ ulong N_PofRecs __attribute__((packed)); +/*00 */ unsigned long Magic __attribute__((packed)); +/*04 */ unsigned long N_PofRecs __attribute__((packed)); /*08 */ } tPofFileHdr; typedef struct PofRecHdr_tag { /* Pof record header */ -/*00 */ word PofRecId __attribute__((packed)); -/*02 */ ulong PofRecDataLen __attribute__((packed)); +/*00 */ unsigned short PofRecId __attribute__((packed)); +/*02 */ unsigned long PofRecDataLen __attribute__((packed)); /*06 */ } tPofRecHdr; typedef struct PofTimeStamp_tag { -/*00 */ ulong UnixTime __attribute__((packed)); - /*04 */ uchar DateTimeText[0x28] __attribute__((packed)); +/*00 */ unsigned long UnixTime __attribute__((packed)); + /*04 */ unsigned char DateTimeText[0x28] __attribute__((packed)); /* =40 */ /*2C */ } tPofTimeStamp; _ ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error 2006-02-25 7:22 ` Andrew Morton @ 2006-02-25 7:56 ` Rusty Russell 0 siblings, 0 replies; 34+ messages in thread From: Rusty Russell @ 2006-02-25 7:56 UTC (permalink / raw) To: Andrew Morton; +Cc: Adrian Bunk, linux-kernel, Karsten Keil On Fri, 2006-02-24 at 23:22 -0800, Andrew Morton wrote: > Bad Rusty should have chosen less generic-sounding identifiers. I actually disagree with that, for three reasons. Firstly, my namespace didn't leak: I only appended these names to clear prefixes. Secondly, uint is already typedefed in types.h. Thirdly, the short names are clear and intuitive. > Bad ISDN shouldn't have gone off and defined its own types, either. That was poor, yes, but typedefs would have been less polluting than #defines. Hope that clarifies! Rusty. -- ccontrol: http://ozlabs.org/~rusty/ccontrol ^ permalink raw reply [flat|nested] 34+ messages in thread
* oss/sonicvibes.c defines its own hweight32 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (3 preceding siblings ...) 2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk @ 2006-02-25 3:47 ` Richard Knutsson 2006-02-25 4:11 ` 2.6.16-rc4-mm2: useless acpi_pmtmr_buggy Adrian Bunk ` (7 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Richard Knutsson @ 2006-02-25 3:47 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel Hi Andrew and all Just tried to compile the kernel with the 'allyesconfig' when I stumbled on this one (have not seen any reports on this one, otherwise sorry for the blotter): CHK usr/initramfs_list CC sound/oss/sonicvibes.o sound/oss/sonicvibes.c:421: error: static declaration of ‘hweight32’ follows non-static declaration include/asm-generic/bitops/hweight.h:6: error: previous declaration of ‘hweight32’ was here make[2]: *** [sound/oss/sonicvibes.o] Error 1 make[1]: *** [sound/oss] Error 2 make: *** [sound] Error 2 I am not sure why it tries to make its own hweight32() so I just disabled it: --- a/sound/oss/sonicvibes.c 2006-02-24 23:14:11.000000000 +0100 +++ b/sound/oss/sonicvibes.c 2006-02-25 04:10:09.000000000 +0100 @@ -408,6 +408,7 @@ static inline unsigned ld2(unsigned int return r; } +#if 0 /* * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word @@ -425,6 +426,7 @@ static inline unsigned int hweight32(uns res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF); return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF); } +#endif /* --------------------------------------------------------------------- */ BTW, I do not have the hardware, so it is just building-tested. Best Richard Knutsson ^ permalink raw reply [flat|nested] 34+ messages in thread
* 2.6.16-rc4-mm2: useless acpi_pmtmr_buggy 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (4 preceding siblings ...) 2006-02-25 3:47 ` oss/sonicvibes.c defines its own hweight32 Richard Knutsson @ 2006-02-25 4:11 ` Adrian Bunk 2006-02-25 11:59 ` 2.6.16-rc4-mm2 Jesper Juhl ` (6 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 4:11 UTC (permalink / raw) To: Andrew Morton, john stultz; +Cc: linux-kernel On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +time-i386-clocksource-drivers-backout-pmtmr-changes.patch > > Various updates, fixes and cleanups for the time management patches in -mm. >... Both before and after this patch, acpi_pmtmr_buggy is useless since it never gets any value assigned. 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 ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (5 preceding siblings ...) 2006-02-25 4:11 ` 2.6.16-rc4-mm2: useless acpi_pmtmr_buggy Adrian Bunk @ 2006-02-25 11:59 ` Jesper Juhl 2006-02-25 12:17 ` 2.6.16-rc4-mm2 Andrew Morton 2006-02-25 13:15 ` [-mm patch] drivers/media/video/cpia2/cpia2_v4l.c cleanups Adrian Bunk ` (5 subsequent siblings) 12 siblings, 1 reply; 34+ messages in thread From: Jesper Juhl @ 2006-02-25 11:59 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, info-linux On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > Geode video breaks the build : LD init/built-in.o LD .tmp_vmlinux1 drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': : undefined reference to `fb_dealloc_cmap' drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': : undefined reference to `fb_alloc_cmap' drivers/built-in.o(.text+0x1359e): In function `gxfb_remove': : undefined reference to `unregister_framebuffer' drivers/built-in.o(.text+0x135f5): In function `gxfb_remove': : undefined reference to `framebuffer_release' drivers/built-in.o(.init.text+0x168e): In function `gxfb_init_fbinfo': : undefined reference to `framebuffer_alloc' drivers/built-in.o(.init.text+0x17b8): In function `gxfb_probe': : undefined reference to `fb_find_mode' drivers/built-in.o(.init.text+0x180f): In function `gxfb_probe': : undefined reference to `register_framebuffer' drivers/built-in.o(.init.text+0x189e): In function `gxfb_probe': : undefined reference to `framebuffer_release' drivers/built-in.o(.init.text+0x192b): In function `gxfb_init': : undefined reference to `fb_get_options' make: *** [.tmp_vmlinux1] Error 1 -- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 11:59 ` 2.6.16-rc4-mm2 Jesper Juhl @ 2006-02-25 12:17 ` Andrew Morton 2006-02-25 12:25 ` 2.6.16-rc4-mm2 Jesper Juhl 0 siblings, 1 reply; 34+ messages in thread From: Andrew Morton @ 2006-02-25 12:17 UTC (permalink / raw) To: Jesper Juhl; +Cc: linux-kernel, info-linux "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > > > Geode video breaks the build : > > LD init/built-in.o > LD .tmp_vmlinux1 > drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': > : undefined reference to `fb_dealloc_cmap' > drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': > : undefined reference to `fb_alloc_cmap' How'd you manage that? Those things are dragged in via CONFIG_FB. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 12:17 ` 2.6.16-rc4-mm2 Andrew Morton @ 2006-02-25 12:25 ` Jesper Juhl 2006-02-25 12:31 ` 2.6.16-rc4-mm2 Andrew Morton 0 siblings, 1 reply; 34+ messages in thread From: Jesper Juhl @ 2006-02-25 12:25 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, info-linux [-- Attachment #1: Type: text/plain, Size: 964 bytes --] On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > > > > > > Geode video breaks the build : > > > > LD init/built-in.o > > LD .tmp_vmlinux1 > > drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': > > : undefined reference to `fb_dealloc_cmap' > > drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': > > : undefined reference to `fb_alloc_cmap' > > How'd you manage that? Those things are dragged in via CONFIG_FB. > with "make randconfig" - the config it generated for me (and which broke) is attached. -- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html [-- Attachment #2: config --] [-- Type: application/octet-stream, Size: 28298 bytes --] # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc4-mm2 # Sat Feb 25 12:26:07 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_DMI=y # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_IKCONFIG is not set # CONFIG_CPUSETS is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y CONFIG_VM86=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_EXTRA_PASS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_SLAB=y CONFIG_SERIAL_PCI=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set # # Loadable module support # CONFIG_MODULES=y # CONFIG_MODULE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_KMOD is not set # # Block layer # # CONFIG_LBD is not set # CONFIG_LSF is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_AS is not set # CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=y # CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" # # 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=y # 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 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_PPRO_FENCE=y CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_ALIGNMENT_16=y CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_MCE=y # CONFIG_X86_MCE_NONFATAL is not set # CONFIG_X86_MCE_P4THERMAL is not set CONFIG_TOSHIBA=y CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_MICROCODE=m CONFIG_X86_MSR=m CONFIG_X86_CPUID=y # # Firmware Drivers # CONFIG_EDD=y CONFIG_DELL_RBU=m # CONFIG_DCDBAS is not set # CONFIG_NOHIGHMEM is not set # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_X86_PAE=y CONFIG_NEED_NODE_MEMMAP_SIZE=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MIGRATION=y CONFIG_HIGHPTE=y CONFIG_MATH_EMULATION=y # CONFIG_MTRR is not set # CONFIG_EFI is not set CONFIG_IRQBALANCE=y CONFIG_REGPARM=y CONFIG_SECCOMP=y CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=100 # CONFIG_KEXEC is not set CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x1000000 # CONFIG_HOTPLUG_CPU is not set CONFIG_DOUBLEFAULT=y # # Power management options (ACPI, APM) # CONFIG_PM=y CONFIG_PM_LEGACY=y CONFIG_PM_DEBUG=y # # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m CONFIG_ACPI_HOTKEY=y CONFIG_ACPI_FAN=m # CONFIG_ACPI_PROCESSOR is not set CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=y CONFIG_ACPI_IBM_DOCK=y CONFIG_ACPI_TOSHIBA=y CONFIG_ACPI_SONY=m CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_DEBUG=y CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y # CONFIG_X86_PM_TIMER is not set # CONFIG_ACPI_CONTAINER is not set # # APM (Advanced Power Management) BIOS Support # # CONFIG_APM is not set # # CPU Frequency scaling # CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set # CONFIG_CPU_FREQ_STAT is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # CPUFreq processor drivers # # CONFIG_X86_POWERNOW_K6 is not set CONFIG_X86_POWERNOW_K7=y CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_GX_SUSPMOD is not set CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y # CONFIG_X86_SPEEDSTEP_ICH is not set CONFIG_X86_SPEEDSTEP_SMI=m CONFIG_X86_P4_CLOCKMOD=y CONFIG_X86_CPUFREQ_NFORCE2=m CONFIG_X86_LONGRUN=m # CONFIG_X86_LONGHAUL is not set # # shared options # CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=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=y # CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y CONFIG_PCIEPORTBUS=y # CONFIG_HOTPLUG_PCI_PCIE is not set CONFIG_PCI_MSI=y # CONFIG_PCI_LEGACY_PROC is not set # CONFIG_PCI_DEBUG is not set CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set # CONFIG_MCA is not set CONFIG_SCx200=y # # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y CONFIG_PCMCIA_LOAD_CIS=y # CONFIG_PCMCIA_IOCTL is not set # CONFIG_CARDBUS is not set # # PC-card bridges # # CONFIG_YENTA is not set CONFIG_PD6729=y # CONFIG_I82092 is not set CONFIG_PCCARD_NONSTATIC=y # # PCI Hotplug Support # CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_FAKE=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=y CONFIG_HOTPLUG_PCI_CPCI_GENERIC=y CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y # # Executable file formats # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_MISC=m # # Networking # # CONFIG_NET is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # # Connector - unified userspace <-> kernelspace linker # # # 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=y # # Protocols # CONFIG_PNPACPI=y # # Block devices # CONFIG_BLK_DEV_FD=m CONFIG_BLK_CPQ_DA=y # CONFIG_BLK_CPQ_CISS_DA is not set CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_UMEM=y # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_UB=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y # CONFIG_BLK_DEV_IDE is not set CONFIG_BLK_DEV_HD_ONLY=y CONFIG_BLK_DEV_HD=y # # SCSI device support # CONFIG_RAID_ATTRS=y CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set # # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set CONFIG_CHR_DEV_OSST=y CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set CONFIG_SCSI_LOGGING=y # # SCSI Transports # CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_FC_ATTRS=y CONFIG_SCSI_SAS_ATTRS=y # CONFIG_SAS_CLASS is not set # # SCSI low-level drivers # CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_ACARD=y CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 CONFIG_AIC7XXX_RESET_DELAY_MS=5000 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set CONFIG_AIC7XXX_DEBUG_MASK=0 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set CONFIG_SCSI_AIC7XXX_OLD=m CONFIG_SCSI_AIC79XX=y CONFIG_AIC79XX_CMDS_PER_DEVICE=32 CONFIG_AIC79XX_RESET_DELAY_MS=5000 # CONFIG_AIC79XX_ENABLE_RD_STRM is not set CONFIG_AIC79XX_DEBUG_ENABLE=y CONFIG_AIC79XX_DEBUG_MASK=0 CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ARCMSR=y # CONFIG_SCSI_ARCMSR_MSI is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set CONFIG_MEGARAID_SAS=y # CONFIG_SCSI_SATA is not set CONFIG_SCSI_BUSLOGIC=y # CONFIG_SCSI_OMIT_FLASHPOINT is not set CONFIG_SCSI_DMX3191D=y CONFIG_SCSI_EATA=y CONFIG_SCSI_EATA_TAGGED_QUEUE=y # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set CONFIG_SCSI_EATA_MAX_TAGS=16 # CONFIG_SCSI_FUTURE_DOMAIN is not set CONFIG_SCSI_GDTH=y CONFIG_SCSI_IPS=m # CONFIG_SCSI_INITIO is not set CONFIG_SCSI_INIA100=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_SYM53C8XX_MMIO=y # CONFIG_SCSI_IPR is not set CONFIG_SCSI_QLOGIC_FC=y CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_1280=y CONFIG_SCSI_QLA_FC=m CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y # CONFIG_SCSI_QLA21XX is not set CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m CONFIG_SCSI_QLA2322=m CONFIG_SCSI_QLA6312=m CONFIG_SCSI_QLA24XX=m # CONFIG_SCSI_LPFC is not set CONFIG_SCSI_DC395x=m # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set CONFIG_SCSI_DEBUG=m # # PCMCIA SCSI adapter support # CONFIG_PCMCIA_AHA152X=m # CONFIG_PCMCIA_FDOMAIN is not set CONFIG_PCMCIA_NINJA_SCSI=m # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set # # Multi-device support (RAID and LVM) # # CONFIG_MD is not set # # Fusion MPT device support # CONFIG_FUSION=y CONFIG_FUSION_SPI=y # CONFIG_FUSION_FC is not set CONFIG_FUSION_SAS=y CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # # CONFIG_IEEE1394 is not set # # I2O device support # CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y # CONFIG_I2O_EXT_ADAPTEC is not set CONFIG_I2O_CONFIG=m # CONFIG_I2O_CONFIG_OLD_IOCTL is not set CONFIG_I2O_BUS=m # CONFIG_I2O_BLOCK is not set CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m # # ISDN subsystem # # # Telephony Support # CONFIG_PHONE=m CONFIG_PHONE_IXJ=m CONFIG_PHONE_IXJ_PCMCIA=m # # 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=m CONFIG_INPUT_TSDEV_SCREEN_X=240 CONFIG_INPUT_TSDEV_SCREEN_Y=320 CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set CONFIG_KEYBOARD_LKKBD=m # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_ANALOG=m CONFIG_JOYSTICK_A3D=m # CONFIG_JOYSTICK_ADI is not set # CONFIG_JOYSTICK_COBRA is not set # CONFIG_JOYSTICK_GF2K is not set CONFIG_JOYSTICK_GRIP=m CONFIG_JOYSTICK_GRIP_MP=y CONFIG_JOYSTICK_GUILLEMOT=m CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_TMDC=m CONFIG_JOYSTICK_IFORCE=m CONFIG_JOYSTICK_IFORCE_USB=y # CONFIG_JOYSTICK_IFORCE_232 is not set CONFIG_JOYSTICK_WARRIOR=m # CONFIG_JOYSTICK_MAGELLAN is not set CONFIG_JOYSTICK_SPACEORB=y CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_STINGER=m CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=y CONFIG_TOUCHSCREEN_ELO=y CONFIG_TOUCHSCREEN_MTOUCH=m # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_INPUT_MISC is not set # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=m CONFIG_SERIO_CT82C710=y CONFIG_SERIO_PCIPS2=y CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set CONFIG_GAMEPORT=y CONFIG_GAMEPORT_NS558=y CONFIG_GAMEPORT_L4=y # CONFIG_GAMEPORT_EMU10K1 is not set # CONFIG_GAMEPORT_FM801 is not set # # Character devices # CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_COMPUTONE=y # CONFIG_ROCKETPORT is not set CONFIG_CYCLADES=m CONFIG_CYZ_INTR=y # CONFIG_DIGIEPCA is not set CONFIG_MOXA_INTELLIO=y CONFIG_MOXA_SMARTIO=m # CONFIG_ISI is not set CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=y CONFIG_SYNCLINK_GT=y # CONFIG_N_HDLC is not set CONFIG_SPECIALIX=m # CONFIG_SPECIALIX_RTSCTS is not set CONFIG_SX=y CONFIG_STALDRV=y # # Serial drivers # CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=y # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_HW_RANDOM is not set CONFIG_NVRAM=y CONFIG_RTC=y # CONFIG_DTLK is not set CONFIG_R3964=y # CONFIG_APPLICOM is not set CONFIG_SONYPI=y # # Ftape, the floppy tape device driver # CONFIG_AGP=m # CONFIG_AGP_ALI is not set CONFIG_AGP_ATI=m CONFIG_AGP_AMD=m # CONFIG_AGP_AMD64 is not set CONFIG_AGP_INTEL=m # CONFIG_AGP_NVIDIA is not set CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m CONFIG_AGP_EFFICEON=m CONFIG_DRM=m CONFIG_DRM_TDFX=m # CONFIG_DRM_R128 is not set # CONFIG_DRM_RADEON is not set CONFIG_DRM_I810=m # CONFIG_DRM_I830 is not set # CONFIG_DRM_I915 is not set # CONFIG_DRM_MGA is not set # CONFIG_DRM_SIS is not set # CONFIG_DRM_VIA is not set # CONFIG_DRM_SAVAGE is not set # # PCMCIA character devices # CONFIG_SYNCLINK_CS=m CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4040=m CONFIG_MWAVE=y # CONFIG_SCx200_GPIO is not set CONFIG_CS5535_GPIO=y CONFIG_RAW_DRIVER=m CONFIG_MAX_RAW_DEVS=256 CONFIG_HPET=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set CONFIG_HANGCHECK_TIMER=m # # TPM devices # # CONFIG_TCG_TPM is not set CONFIG_TELCLOCK=m # # I2C support # CONFIG_I2C=m # CONFIG_I2C_CHARDEV is not set # # I2C Algorithms # CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCF=m CONFIG_I2C_ALGOPCA=m # # I2C Hardware Bus support # CONFIG_I2C_ALI1535=m # CONFIG_I2C_ALI1563 is not set CONFIG_I2C_ALI15X3=m CONFIG_I2C_AMD756=m # CONFIG_I2C_AMD756_S4882 is not set CONFIG_I2C_AMD8111=m CONFIG_I2C_I801=m # CONFIG_I2C_I810 is not set CONFIG_I2C_PIIX4=m # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT_LIGHT is not set CONFIG_I2C_PROSAVAGE=m CONFIG_I2C_SAVAGE4=m CONFIG_SCx200_ACB=m CONFIG_I2C_SIS5595=m CONFIG_I2C_SIS630=m CONFIG_I2C_SIS96X=m # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set CONFIG_I2C_VIAPRO=m # CONFIG_I2C_VOODOO3 is not set # CONFIG_I2C_PCA_ISA is not set # # Miscellaneous I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_PCF8574=m # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set CONFIG_I2C_DEBUG_CORE=y # CONFIG_I2C_DEBUG_ALGO is not set CONFIG_I2C_DEBUG_BUS=y CONFIG_I2C_DEBUG_CHIP=y # # SPI support # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set # # Dallas's 1-wire bus # CONFIG_W1=y # # 1-wire Bus Masters # # CONFIG_W1_MASTER_MATROX is not set CONFIG_W1_MASTER_DS9490=m # CONFIG_W1_MASTER_DS9490_BRIDGE is not set CONFIG_W1_MASTER_DS2482=m # # 1-wire Slaves # CONFIG_W1_SLAVE_THERM=m CONFIG_W1_SLAVE_SMEM=y CONFIG_W1_SLAVE_DS2433=y # # Hardware Monitoring support # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set # # Misc devices # CONFIG_IBM_ASM=y # # Multimedia devices # CONFIG_VIDEO_DEV=y # # Video For Linux # # # Video Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_BT848 is not set CONFIG_VIDEO_CPIA=y # CONFIG_VIDEO_CPIA_USB is not set CONFIG_VIDEO_CPIA2=m # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_MEYE is not set CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_MXB=m # CONFIG_VIDEO_DPC is not set CONFIG_VIDEO_HEXIUM_ORION=m # CONFIG_VIDEO_HEXIUM_GEMINI is not set # CONFIG_VIDEO_CX88 is not set CONFIG_VIDEO_EM28XX=m # CONFIG_VIDEO_OVCAMCHIP is not set # CONFIG_VIDEO_AUDIO_DECODER is not set # CONFIG_VIDEO_DECODER is not set # # Radio Adapters # CONFIG_RADIO_GEMTEK_PCI=y # CONFIG_RADIO_MAXIRADIO is not set CONFIG_RADIO_MAESTRO=m # # Digital Video Broadcasting Devices # CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_VIDEO_VIDEOBUF=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m # # Graphics support # CONFIG_FB=m CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_FIRMWARE_EDID is not set CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CIRRUS is not set CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y CONFIG_FB_CYBER2000=m # CONFIG_FB_ARC is not set # CONFIG_FB_VGA16 is not set CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=m # CONFIG_FB_HGA_ACCEL is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_NVIDIA=m CONFIG_FB_NVIDIA_I2C=y CONFIG_FB_RIVA=m # CONFIG_FB_RIVA_I2C is not set # CONFIG_FB_RIVA_DEBUG is not set # CONFIG_FB_I810 is not set CONFIG_FB_INTEL=m CONFIG_FB_INTEL_DEBUG=y CONFIG_FB_MATROX=m # CONFIG_FB_MATROX_MILLENIUM is not set # CONFIG_FB_MATROX_MYSTIQUE is not set CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m # CONFIG_FB_MATROX_MULTIHEAD is not set # CONFIG_FB_RADEON_OLD is not set # CONFIG_FB_RADEON is not set CONFIG_FB_ATY128=m CONFIG_FB_ATY=m CONFIG_FB_ATY_CT=y # CONFIG_FB_ATY_GENERIC_LCD is not set # CONFIG_FB_ATY_GX is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set CONFIG_FB_CYBLA=m # CONFIG_FB_TRIDENT is not set CONFIG_FB_GEODE=y CONFIG_FB_GEODE_GX=y # CONFIG_FB_GEODE_GX1 is not set # CONFIG_FB_VIRTUAL is not set # # Console display driver support # CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE is not set CONFIG_FONT_8x16=y # # Logo configuration # # CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BACKLIGHT_CLASS_DEVICE is not set # CONFIG_LCD_CLASS_DEVICE is not set # # Sound # # CONFIG_SOUND is not set # # USB support # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB=m CONFIG_USB_DEBUG=y # # Miscellaneous USB options # # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_USBFS2 is not set # # USB Host Controller Drivers # CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m # # USB Device Class drivers # # 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 is not set # CONFIG_USB_LIBUSUAL is not set # # USB Input Devices # # CONFIG_USB_HID is not set # # USB HID Boot Protocol drivers # # CONFIG_USB_KBD is not set CONFIG_USB_MOUSE=m CONFIG_USB_AIPTEK=m # CONFIG_USB_WACOM is not set # CONFIG_USB_ACECAD is not set # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set CONFIG_USB_MTOUCH=m # CONFIG_USB_ITMTOUCH is not set CONFIG_USB_EGALAX=m # CONFIG_USB_YEALINK is not set CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m CONFIG_USB_ATI_REMOTE2=m # CONFIG_USB_KEYSPAN_REMOTE is not set CONFIG_USB_APPLETOUCH=m # # USB Imaging devices # # CONFIG_USB_MDC800 is not set CONFIG_USB_MICROTEK=m # # USB Multimedia devices # # CONFIG_USB_DABUSB is not set # CONFIG_USB_VICAM is not set CONFIG_USB_DSBR=m CONFIG_USB_ET61X251=m CONFIG_USB_IBMCAM=m # CONFIG_USB_KONICAWC is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # # Networking support is needed for USB Network Adapter support # # CONFIG_USB_MON is not set # # USB port drivers # # # USB Serial Converter support # # CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers # CONFIG_USB_EMI62=m # CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m # CONFIG_USB_LED is not set # CONFIG_USB_CYTHERM is not set CONFIG_USB_GOTEMP=m # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set CONFIG_USB_IDMOUSE=m CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y CONFIG_USB_LD=m # # USB DSL modem support # # # USB Gadget Support # CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_SELECTED=y CONFIG_USB_GADGET_NET2280=y CONFIG_USB_NET2280=y # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set CONFIG_USB_GADGET_DUALSPEED=y # CONFIG_USB_ZERO is not set # CONFIG_USB_ETH is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set CONFIG_USB_G_SERIAL=y # # MMC/SD Card support # CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set # CONFIG_MMC_BLOCK is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_WBSD=y # # LED devices # CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y # CONFIG_LEDS_TRIGGERS is not set # # InfiniBand support # CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USER_ACCESS is not set # CONFIG_INFINIBAND_MTHCA is not set CONFIG_INFINIBAND_SRP=m # # SN Devices # # # EDAC - error detection and reporting (RAS) # CONFIG_EDAC=m # # Reporting subsystems # # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m # CONFIG_EDAC_AMD76X is not set CONFIG_EDAC_E7XXX=m CONFIG_EDAC_E752X=m CONFIG_EDAC_I82875P=m # CONFIG_EDAC_I82860 is not set CONFIG_EDAC_R82600=m CONFIG_EDAC_POLL=y # # Real Time Clock # # CONFIG_RTC_CLASS is not set # # File systems # CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_REISER4_FS is not set CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_REISERFS_FS_XATTR is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set CONFIG_MINIX_FS=y # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=m # CONFIG_AUTOFS4_FS is not set CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=m # CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y # CONFIG_VFAT_FS is not set CONFIG_FAT_DEFAULT_CODEPAGE=437 # CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_VMCORE=y CONFIG_SYSFS=y # CONFIG_TMPFS is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y CONFIG_CONFIGFS_FS=m # # Miscellaneous filesystems # CONFIG_ADFS_FS=y # CONFIG_ADFS_FS_RW is not set # CONFIG_AFFS_FS is not set CONFIG_ASFS_FS=y CONFIG_ASFS_DEFAULT_CODEPAGE="" # CONFIG_ASFS_RW is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m CONFIG_BEFS_FS=m # CONFIG_BEFS_DEBUG is not set CONFIG_BFS_FS=y CONFIG_EFS_FS=m CONFIG_CRAMFS=y CONFIG_VXFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set CONFIG_SYSV_FS=y CONFIG_UFS_FS=y # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y # # Native Language Support # CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_CODEPAGE_737=m CONFIG_NLS_CODEPAGE_775=m CONFIG_NLS_CODEPAGE_850=m CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_855 is not set CONFIG_NLS_CODEPAGE_857=m CONFIG_NLS_CODEPAGE_860=m CONFIG_NLS_CODEPAGE_861=y CONFIG_NLS_CODEPAGE_862=m CONFIG_NLS_CODEPAGE_863=m CONFIG_NLS_CODEPAGE_864=y # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set CONFIG_NLS_CODEPAGE_869=y CONFIG_NLS_CODEPAGE_936=y # CONFIG_NLS_CODEPAGE_950 is not set CONFIG_NLS_CODEPAGE_932=y CONFIG_NLS_CODEPAGE_949=m CONFIG_NLS_CODEPAGE_874=y CONFIG_NLS_ISO8859_8=m CONFIG_NLS_CODEPAGE_1250=m CONFIG_NLS_CODEPAGE_1251=m CONFIG_NLS_ASCII=y # CONFIG_NLS_ISO8859_1 is not set # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set CONFIG_NLS_ISO8859_4=m # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set CONFIG_NLS_ISO8859_7=y CONFIG_NLS_ISO8859_9=m CONFIG_NLS_ISO8859_13=m # CONFIG_NLS_ISO8859_14 is not set CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=y # # Instrumentation Support # CONFIG_PROFILING=y CONFIG_OPROFILE=m CONFIG_KPROBES=y # # Kernel hacking # # CONFIG_PRINTK_TIME is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_SHIRQ is not set CONFIG_DEBUG_KERNEL=y CONFIG_LOG_BUF_SHIFT=16 # CONFIG_DETECT_SOFTLOCKUP is not set # CONFIG_SCHEDSTATS is not set CONFIG_DEBUG_SLAB=y # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_SPINLOCK is not set CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_PAGE_OWNER is not set CONFIG_DEBUG_FS=y CONFIG_DEBUG_VM=y CONFIG_FRAME_POINTER=y CONFIG_UNWIND_INFO=y CONFIG_FORCED_INLINING=y CONFIG_RCU_TORTURE_TEST=y CONFIG_DEBUG_SYNCHRO_TEST=m CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_STACK_BACKTRACE_COLS=2 # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_INITDATA is not set CONFIG_4KSTACKS=y CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y # # Security options # CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set CONFIG_SECURITY=y # CONFIG_SECURITY_NETWORK is not set CONFIG_SECURITY_CAPABILITIES=m # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SECLVL=m # # Cryptographic options # CONFIG_CRYPTO=y # CONFIG_CRYPTO_HMAC is not set CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=m CONFIG_CRYPTO_SHA1=m CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=m # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=y # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_AES is not set CONFIG_CRYPTO_AES_586=y CONFIG_CRYPTO_CAST5=m # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_ARC4 is not set CONFIG_CRYPTO_KHAZAD=y CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_CRC32C is not set CONFIG_CRYPTO_TEST=y # # Hardware crypto devices # CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_AES=y # # Library routines # CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y 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_KTIME_SCALAR=y ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 12:25 ` 2.6.16-rc4-mm2 Jesper Juhl @ 2006-02-25 12:31 ` Andrew Morton 2006-02-25 12:41 ` 2.6.16-rc4-mm2 Jesper Juhl 0 siblings, 1 reply; 34+ messages in thread From: Andrew Morton @ 2006-02-25 12:31 UTC (permalink / raw) To: Jesper Juhl; +Cc: linux-kernel, info-linux "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > > > > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > > > > > > > > > Geode video breaks the build : > > > > > > LD init/built-in.o > > > LD .tmp_vmlinux1 > > > drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': > > > : undefined reference to `fb_dealloc_cmap' > > > drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': > > > : undefined reference to `fb_alloc_cmap' > > > > How'd you manage that? Those things are dragged in via CONFIG_FB. > > > with "make randconfig" - the config it generated for me (and which > broke) is attached. CONFIG_FB=m, CONFIG_FB_GEODE_GX=y. An easy mistake, that. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 12:31 ` 2.6.16-rc4-mm2 Andrew Morton @ 2006-02-25 12:41 ` Jesper Juhl 2006-02-25 15:51 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-26 23:38 ` 2.6.16-rc4-mm2 Antonino A. Daplas 0 siblings, 2 replies; 34+ messages in thread From: Jesper Juhl @ 2006-02-25 12:41 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, info-linux On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > > > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > > > > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > > > > > > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > > > > > > > > > > > > Geode video breaks the build : > > > > > > > > LD init/built-in.o > > > > LD .tmp_vmlinux1 > > > > drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': > > > > : undefined reference to `fb_dealloc_cmap' > > > > drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': > > > > : undefined reference to `fb_alloc_cmap' > > > > > > How'd you manage that? Those things are dragged in via CONFIG_FB. > > > > > with "make randconfig" - the config it generated for me (and which > > broke) is attached. > > CONFIG_FB=m, CONFIG_FB_GEODE_GX=y. An easy mistake, that. > Does it even make sense to build CONFIG_FB modular? -- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 12:41 ` 2.6.16-rc4-mm2 Jesper Juhl @ 2006-02-25 15:51 ` Jesper Juhl 2006-02-26 23:38 ` 2.6.16-rc4-mm2 Antonino A. Daplas 1 sibling, 0 replies; 34+ messages in thread From: Jesper Juhl @ 2006-02-25 15:51 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 1623 bytes --] On 2/25/06, Jesper Juhl <jesper.juhl@gmail.com> wrote: > On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > > > On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: > > > > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: > > > > > > > > > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: > > > > > > > > > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > > > > > > > > > > > > > > > > Geode video breaks the build : > > > > > > > > > > LD init/built-in.o > > > > > LD .tmp_vmlinux1 > > > > > drivers/built-in.o(.text+0x133f6): In function `gxfb_set_par': > > > > > : undefined reference to `fb_dealloc_cmap' > > > > > drivers/built-in.o(.text+0x13432): In function `gxfb_set_par': > > > > > : undefined reference to `fb_alloc_cmap' > > > > > > > > How'd you manage that? Those things are dragged in via CONFIG_FB. > > > > > > > with "make randconfig" - the config it generated for me (and which > > > broke) is attached. > > > > CONFIG_FB=m, CONFIG_FB_GEODE_GX=y. An easy mistake, that. > > > > Does it even make sense to build CONFIG_FB modular? > Whoops, broke it again with a different config (attached) : LD init/built-in.o LD vmlinux kernel/built-in.o(.data+0x8b8): undefined reference to `uevent_helper' make: *** [vmlinux] Error 1 -- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html [-- Attachment #2: config --] [-- Type: application/octet-stream, Size: 16114 bytes --] # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc4-mm2 # Sat Feb 25 15:00:18 2006 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y CONFIG_SEMAPHORE_SLEEPERS=y CONFIG_X86=y CONFIG_MMU=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_DMI=y # # Code maturity level options # # CONFIG_EXPERIMENTAL is not set CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y # CONFIG_SYSVIPC is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y CONFIG_IKCONFIG=y # CONFIG_IKCONFIG_PROC is not set CONFIG_CPUSETS=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" # CONFIG_UID16 is not set CONFIG_VM86=y CONFIG_EMBEDDED=y # CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y # CONFIG_PRINTK is not set CONFIG_BUG=y # CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y # CONFIG_FUTEX is not set # CONFIG_EPOLL is not set # CONFIG_SHMEM is not set CONFIG_SLAB=y CONFIG_TINY_SHMEM=y CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set # # Loadable module support # # CONFIG_MODULES is not set # # Block layer # CONFIG_LBD=y CONFIG_LSF=y # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set CONFIG_DEFAULT_IOSCHED="anticipatory" # # Processor type and features # # CONFIG_X86_PC is not set # 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=y # CONFIG_X86_ES7000 is not set CONFIG_X86_CYCLONE_TIMER=y # 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 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set CONFIG_MCRUSOE=y # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_TSC=y # CONFIG_HPET_TIMER is not set CONFIG_SMP=y CONFIG_NR_CPUS=8 # CONFIG_SCHED_SMT is not set # CONFIG_SCHED_MC is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_MCE is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set # CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_MICROCODE is not set # CONFIG_X86_MSR is not set CONFIG_X86_CPUID=y # # Firmware Drivers # CONFIG_DELL_RBU=y CONFIG_DCDBAS=y # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_IRQBALANCE=y CONFIG_REGPARM=y CONFIG_SECCOMP=y CONFIG_HZ_100=y # CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_PHYSICAL_START=0x100000 CONFIG_DOUBLEFAULT=y # # Power management options (ACPI, APM) # CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set # # ACPI (Advanced Configuration and Power Interface) Support # # CONFIG_ACPI is not set # # APM (Advanced Power Management) BIOS Support # CONFIG_APM=y CONFIG_APM_IGNORE_USER_SUSPEND=y # CONFIG_APM_DO_ENABLE is not set CONFIG_APM_CPU_IDLE=y # CONFIG_APM_DISPLAY_BLANK is not set # CONFIG_APM_RTC_IS_GMT is not set CONFIG_APM_ALLOW_INTS=y # 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 is not set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set CONFIG_CPU_FREQ_GOV_ONDEMAND=y # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # # CPUFreq processor drivers # CONFIG_X86_POWERNOW_K6=y CONFIG_X86_POWERNOW_K7=y CONFIG_X86_SPEEDSTEP_CENTRINO=y CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y # CONFIG_X86_SPEEDSTEP_ICH is not set CONFIG_X86_P4_CLOCKMOD=y CONFIG_X86_LONGRUN=y CONFIG_X86_LONGHAUL=y # # shared options # CONFIG_X86_SPEEDSTEP_LIB=y # # Bus options (PCI, PCMCIA, EISA, MCA, ISA) # # CONFIG_PCI is not set CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set CONFIG_MCA=y # CONFIG_MCA_LEGACY is not set CONFIG_SCx200=y # # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=y # CONFIG_PCMCIA_DEBUG is not set CONFIG_PCMCIA=y CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # # CONFIG_I82365 is not set CONFIG_TCIC=y CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y # # PCI Hotplug Support # # # Executable file formats # # CONFIG_BINFMT_ELF is not set CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_MISC=y # # Networking # # CONFIG_NET is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y # # Connector - unified userspace <-> kernelspace linker # # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set # # Parallel port support # CONFIG_PARPORT=y CONFIG_PARPORT_PC=y CONFIG_PARPORT_PC_PCMCIA=y # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_1284=y # # Plug and Play support # CONFIG_PNP=y # CONFIG_PNP_DEBUG is not set # # Protocols # # CONFIG_ISAPNP is not set # # Block devices # CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_XD=y CONFIG_PARIDE=y CONFIG_PARIDE_PARPORT=y # # Parallel IDE high-level drivers # CONFIG_PARIDE_PD=y CONFIG_PARIDE_PCD=y # CONFIG_PARIDE_PF is not set # CONFIG_PARIDE_PT is not set CONFIG_PARIDE_PG=y # # Parallel IDE protocol modules # CONFIG_PARIDE_ATEN=y CONFIG_PARIDE_BPCK=y CONFIG_PARIDE_BPCK6=y # CONFIG_PARIDE_COMM is not set # CONFIG_PARIDE_DSTR is not set CONFIG_PARIDE_FIT2=y # CONFIG_PARIDE_FIT3 is not set CONFIG_PARIDE_EPAT=y # CONFIG_PARIDE_EPIA is not set CONFIG_PARIDE_FRIQ=y # CONFIG_PARIDE_FRPW is not set # CONFIG_PARIDE_KBIC is not set # CONFIG_PARIDE_KTTI is not set # CONFIG_PARIDE_ON20 is not set # CONFIG_PARIDE_ON26 is not set # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_CDROM_PKTCDVD=y CONFIG_CDROM_PKTCDVD_BUFFERS=8 # # ATA/ATAPI/MFM/RLL support # # CONFIG_IDE is not set # # SCSI device support # CONFIG_RAID_ATTRS=y # CONFIG_SCSI is not set # # Old CD-ROM drivers (not SCSI, not IDE) # CONFIG_CD_NO_IDESCSI=y CONFIG_AZTCD=y # CONFIG_GSCD is not set # CONFIG_MCDX is not set # CONFIG_OPTCD is not set # CONFIG_SJCD is not set # CONFIG_ISP16_CDI is not set # CONFIG_CDU535 is not set # # Multi-device support (RAID and LVM) # CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=y # CONFIG_MD_RAID0 is not set CONFIG_MD_RAID1=y # CONFIG_MD_RAID5 is not set # CONFIG_MD_RAID6 is not set # CONFIG_MD_MULTIPATH is not set # CONFIG_MD_FAULTY is not set CONFIG_BLK_DEV_DM=y # # Fusion MPT device support # # CONFIG_FUSION is not set # # IEEE 1394 (FireWire) support # # # I2O device support # # # ISDN subsystem # # # Telephony Support # # CONFIG_PHONE is not set # # Input device support # CONFIG_INPUT=y # # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=240 CONFIG_INPUT_TSDEV_SCREEN_Y=320 CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=y # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_SUNKBD=y # CONFIG_KEYBOARD_LKKBD is not set CONFIG_KEYBOARD_XTKBD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_GUNZE is not set CONFIG_TOUCHSCREEN_ELO=y CONFIG_TOUCHSCREEN_MTOUCH=y CONFIG_TOUCHSCREEN_MK712=y # CONFIG_INPUT_MISC is not set # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y CONFIG_SERIO_CT82C710=y # CONFIG_SERIO_PARKBD is not set CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set CONFIG_GAMEPORT=y # CONFIG_GAMEPORT_NS558 is not set CONFIG_GAMEPORT_L4=y # # Character devices # CONFIG_VT=y # CONFIG_VT_CONSOLE is not set 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_CS is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set CONFIG_SERIAL_8250_MCA=y # # Non-8250 serial port support # CONFIG_SERIAL_CORE=y # CONFIG_UNIX98_PTYS is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_PRINTER is not set # CONFIG_PPDEV is not set CONFIG_TIPAR=y # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set CONFIG_NVRAM=y CONFIG_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # # Ftape, the floppy tape device driver # CONFIG_AGP=y # CONFIG_AGP_ALI is not set # CONFIG_AGP_ATI is not set # CONFIG_AGP_AMD is not set CONFIG_AGP_AMD64=y # CONFIG_AGP_INTEL is not set # CONFIG_AGP_NVIDIA is not set CONFIG_AGP_SIS=y CONFIG_AGP_SWORKS=y CONFIG_AGP_VIA=y # CONFIG_AGP_EFFICEON is not set # # PCMCIA character devices # CONFIG_SYNCLINK_CS=y # CONFIG_CARDMAN_4000 is not set CONFIG_CARDMAN_4040=y CONFIG_MWAVE=y # CONFIG_SCx200_GPIO is not set CONFIG_CS5535_GPIO=y # CONFIG_RAW_DRIVER is not set CONFIG_HANGCHECK_TIMER=y # # TPM devices # # # I2C support # CONFIG_I2C=y CONFIG_I2C_CHARDEV=y # # I2C Algorithms # CONFIG_I2C_ALGOBIT=y CONFIG_I2C_ALGOPCF=y CONFIG_I2C_ALGOPCA=y # # I2C Hardware Bus support # CONFIG_I2C_ISA=y CONFIG_I2C_PARPORT=y CONFIG_I2C_PARPORT_LIGHT=y CONFIG_I2C_PCA_ISA=y # # Miscellaneous I2C Chip support # CONFIG_I2C_DEBUG_CORE=y # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set CONFIG_I2C_DEBUG_CHIP=y # # SPI support # CONFIG_SPI=y CONFIG_SPI_MASTER=y # # SPI Master Controller Drivers # # # SPI Protocol Masters # # # Dallas's 1-wire bus # # CONFIG_W1 is not set # # Hardware Monitoring support # CONFIG_HWMON=y CONFIG_HWMON_VID=y # CONFIG_SENSORS_ADM1021 is not set CONFIG_SENSORS_GL518SM=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_LM75 is not set CONFIG_SENSORS_LM83=y # CONFIG_SENSORS_LM90 is not set CONFIG_SENSORS_W83781D=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_HDAPS is not set # CONFIG_HWMON_DEBUG_CHIP is not set # # Misc devices # # # Multimedia devices # # CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices # # # Graphics support # CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set # CONFIG_FB_FIRMWARE_EDID is not set CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_ARC=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_VESA is not set CONFIG_VIDEO_SELECT=y CONFIG_FB_HGA=y # CONFIG_FB_S1D13XXX is not set CONFIG_FB_VIRTUAL=y # # Console display driver support # CONFIG_VGA_CONSOLE=y # CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_MDA_CONSOLE=y CONFIG_DUMMY_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE is not set # # Logo configuration # # CONFIG_LOGO is not set # # Sound # # CONFIG_SOUND is not set # # USB support # # CONFIG_USB_ARCH_HAS_HCD is not set # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # # # USB Gadget Support # CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DEBUG_FILES=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set # # MMC/SD Card support # # CONFIG_MMC is not set # # LED devices # # CONFIG_NEW_LEDS is not set # # InfiniBand support # # # SN Devices # # # EDAC - error detection and reporting (RAS) # CONFIG_EDAC=y # # Reporting subsystems # # CONFIG_EDAC_DEBUG is not set # CONFIG_EDAC_MM_EDAC is not set CONFIG_EDAC_POLL=y # # Real Time Clock # # # File systems # CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y CONFIG_QUOTA=y CONFIG_QFMT_V1=y CONFIG_QFMT_V2=y CONFIG_QUOTACTL=y # CONFIG_DNOTIFY is not set CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set CONFIG_UDF_FS=y CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y # CONFIG_MSDOS_FS is not set CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y # CONFIG_PROC_KCORE is not set # CONFIG_SYSFS is not set CONFIG_TMPFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # # Miscellaneous filesystems # # CONFIG_HFSPLUS_FS is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set CONFIG_HPFS_FS=y CONFIG_QNX4FS_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y # # Native Language Support # CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=y CONFIG_NLS_CODEPAGE_775=y # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_CODEPAGE_852 is not set CONFIG_NLS_CODEPAGE_855=y # 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=y CONFIG_NLS_CODEPAGE_863=y CONFIG_NLS_CODEPAGE_864=y # 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=y # CONFIG_NLS_CODEPAGE_932 is not set CONFIG_NLS_CODEPAGE_949=y # CONFIG_NLS_CODEPAGE_874 is not set CONFIG_NLS_ISO8859_8=y # CONFIG_NLS_CODEPAGE_1250 is not set CONFIG_NLS_CODEPAGE_1251=y # CONFIG_NLS_ASCII is not set # CONFIG_NLS_ISO8859_1 is not set CONFIG_NLS_ISO8859_2=y CONFIG_NLS_ISO8859_3=y # 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=y CONFIG_NLS_ISO8859_14=y CONFIG_NLS_ISO8859_15=y # CONFIG_NLS_KOI8_R is not set CONFIG_NLS_KOI8_U=y # CONFIG_NLS_UTF8 is not set # # Kernel hacking # CONFIG_PRINTK_TIME=y # CONFIG_MAGIC_SYSRQ is not set CONFIG_DEBUG_SHIRQ=y # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=15 # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_UNWIND_INFO=y CONFIG_EARLY_PRINTK=y CONFIG_STACK_BACKTRACE_COLS=2 CONFIG_4KSTACKS=y CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y # # Security options # CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set # # Cryptographic options # # CONFIG_CRYPTO is not set # # Hardware crypto devices # # # Library routines # CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC32=y CONFIG_LIBCRC32C=y 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_KTIME_SCALAR=y ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: 2.6.16-rc4-mm2 2006-02-25 12:41 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-25 15:51 ` 2.6.16-rc4-mm2 Jesper Juhl @ 2006-02-26 23:38 ` Antonino A. Daplas 1 sibling, 0 replies; 34+ messages in thread From: Antonino A. Daplas @ 2006-02-26 23:38 UTC (permalink / raw) To: Jesper Juhl; +Cc: Andrew Morton, linux-kernel, info-linux Jesper Juhl wrote: > On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: >> "Jesper Juhl" <jesper.juhl@gmail.com> wrote: >>> On 2/25/06, Andrew Morton <akpm@osdl.org> wrote: >>> > "Jesper Juhl" <jesper.juhl@gmail.com> wrote: >>> > > >>> > > On 2/24/06, Andrew Morton <akpm@osdl.org> wrote: >>> > > > >> CONFIG_FB=m, CONFIG_FB_GEODE_GX=y. An easy mistake, that. >> Need to change CONFIG_FB_GEODE_GX to depends on (FB = y) > > Does it even make sense to build CONFIG_FB modular? > If you're a developer. Tony ^ permalink raw reply [flat|nested] 34+ messages in thread
* [-mm patch] drivers/media/video/cpia2/cpia2_v4l.c cleanups 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (6 preceding siblings ...) 2006-02-25 11:59 ` 2.6.16-rc4-mm2 Jesper Juhl @ 2006-02-25 13:15 ` Adrian Bunk 2006-02-25 13:18 ` [-mm patch] kernel/params.c: make param_array() static Adrian Bunk ` (4 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:15 UTC (permalink / raw) To: Andrew Morton, scottbertin, Alan Cox; +Cc: linux-kernel, Mauro Carvalho Chehab On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +add-cpia2-camera-support.patch > > CPIA camera driver This patch contains the following cleanups: - make 2 needlessly global functions static - remove cpia2_setup(): the driver already allows setting parameters through module_param(), and there's no reason for having two different ways for setting the same parameters Signed-off-by: Adrian Bunk <bunk@stusta.de> --- Documentation/video4linux/README.cpia2 | 2 - drivers/media/video/cpia2/cpia2_v4l.c | 29 +------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) --- linux-2.6.16-rc4-mm2-full/Documentation/video4linux/README.cpia2.old 2006-02-25 05:00:43.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/Documentation/video4linux/README.cpia2 2006-02-25 05:01:30.000000000 +0100 @@ -70,7 +70,7 @@ If the driver is compiled into the kernel, at boot time specify them like this: - cpia2=num_buffers:3,buffer_size:65535 + cpia2.num_buffers=3 cpia2.buffer_size=65535 What buffer size should I use? ------------------------------ --- linux-2.6.16-rc4-mm2-full/drivers/media/video/cpia2/cpia2_v4l.c.old 2006-02-25 05:02:17.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/drivers/media/video/cpia2/cpia2_v4l.c 2006-02-25 05:38:03.000000000 +0100 @@ -2054,7 +2054,7 @@ * cpia2_init/module_init * *****************************************************************************/ -int __init cpia2_init(void) +static int __init cpia2_init(void) { LOG("%s v%d.%d.%d\n", ABOUT, CPIA2_MAJ_VER, CPIA2_MIN_VER, CPIA2_PATCH_VER); @@ -2069,37 +2069,12 @@ * cpia2_exit/module_exit * *****************************************************************************/ -void __exit cpia2_exit(void) +static void __exit cpia2_exit(void) { cpia2_usb_cleanup(); schedule_timeout(2 * HZ); } - -int __init cpia2_setup(char *str) -{ - while(str) { - if(!strncmp(str, "buffer_size:", 12)) { - buffer_size = simple_strtoul(str + 13, &str, 10); - } else if(!strncmp(str, "num_buffers:", 12)) { - num_buffers = simple_strtoul(str + 13, &str, 10); - } else if(!strncmp(str, "alternate:", 10)) { - alternate = simple_strtoul(str + 11, &str, 10); - } else if(!strncmp(str, "video_nr:", 9)) { - video_nr = simple_strtoul(str + 10, &str, 10); - } else if(!strncmp(str, "flicker_freq:",13)) { - flicker_freq = simple_strtoul(str + 14, &str, 10); - } else if(!strncmp(str, "flicker_mode:",13)) { - flicker_mode = simple_strtoul(str + 14, &str, 10); - } else { - ++str; - } - } - return 1; -} - -__setup("cpia2=", cpia2_setup); - module_init(cpia2_init); module_exit(cpia2_exit); ^ permalink raw reply [flat|nested] 34+ messages in thread
* [-mm patch] kernel/params.c: make param_array() static 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (7 preceding siblings ...) 2006-02-25 13:15 ` [-mm patch] drivers/media/video/cpia2/cpia2_v4l.c cleanups Adrian Bunk @ 2006-02-25 13:18 ` Adrian Bunk 2006-02-25 13:21 ` [-mm patch] drivers/rtc/: make some structs static Adrian Bunk ` (3 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:18 UTC (permalink / raw) To: Andrew Morton, Rusty Russell; +Cc: linux-kernel On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +remove-module_parm.patch >... > Current 2.6.16 queue. Some of these are a bit questionable at this stage. >... param_array() in kernel/params.c can now become static. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- include/linux/moduleparam.h | 7 ------- kernel/params.c | 12 ++++++------ 2 files changed, 6 insertions(+), 13 deletions(-) --- linux-2.6.16-rc4-mm2-full/include/linux/moduleparam.h.old 2006-02-25 04:39:11.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/include/linux/moduleparam.h 2006-02-25 04:40:01.000000000 +0100 @@ -162,13 +162,6 @@ extern int param_set_copystring(const char *val, struct kernel_param *kp); extern int param_get_string(char *buffer, struct kernel_param *kp); -int param_array(const char *name, - const char *val, - unsigned int min, unsigned int max, - void *elem, int elemsize, - int (*set)(const char *, struct kernel_param *kp), - int *num); - /* for exporting parameters in /sys/parameters */ struct module; --- linux-2.6.16-rc4-mm2-full/kernel/params.c.old 2006-02-25 04:40:07.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/kernel/params.c 2006-02-25 04:42:55.000000000 +0100 @@ -265,12 +265,12 @@ } /* We cheat here and temporarily mangle the string. */ -int param_array(const char *name, - const char *val, - unsigned int min, unsigned int max, - void *elem, int elemsize, - int (*set)(const char *, struct kernel_param *kp), - int *num) +static int param_array(const char *name, + const char *val, + unsigned int min, unsigned int max, + void *elem, int elemsize, + int (*set)(const char *, struct kernel_param *kp), + int *num) { int ret; struct kernel_param kp; ^ permalink raw reply [flat|nested] 34+ messages in thread
* [-mm patch] drivers/rtc/: make some structs static 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (8 preceding siblings ...) 2006-02-25 13:18 ` [-mm patch] kernel/params.c: make param_array() static Adrian Bunk @ 2006-02-25 13:21 ` Adrian Bunk 2006-02-25 13:24 ` [-mm patch] kernel/fork.c: make signal_cachep static Adrian Bunk ` (2 subsequent siblings) 12 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:21 UTC (permalink / raw) To: Andrew Morton, Alessandro Zummo; +Cc: linux-kernel, Greg KH, Russell King On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +rtc-subsystem-class.patch > +rtc-subsystem-arm-cleanup.patch > +rtc-subsystem-i2c-cleanup.patch > +rtc-subsystem-sysfs-interface.patch > +rtc-subsystem-proc-interface.patch > +rtc-subsystem-dev-interface.patch > +rtc-subsystem-x1205-driver.patch > +rtc-subsystem-test-device-driver.patch > +rtc-subsystem-ds1672-driver.patch > +rtc-subsystem-pcf8563-driver.patch > +rtc-subsystem-rs5c372-driver.patch > > rtc subsystem rework. These patches are being updated. >... This patch makes some needlessly global structs static. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- drivers/rtc/rtc-dev.c | 2 +- drivers/rtc/rtc-proc.c | 2 +- drivers/rtc/rtc-sysfs.c | 2 +- drivers/rtc/rtc-test.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-dev.c.old 2006-02-25 04:52:13.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-dev.c 2006-02-25 04:52:28.000000000 +0100 @@ -330,7 +330,7 @@ /* interface registration */ -struct class_interface rtc_dev_interface = { +static struct class_interface rtc_dev_interface = { .add = &rtc_dev_add_device, .remove = &rtc_dev_remove_device, }; --- linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-proc.c.old 2006-02-25 04:52:32.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-proc.c 2006-02-25 04:52:40.000000000 +0100 @@ -135,7 +135,7 @@ mutex_unlock(&rtc_lock); } -struct class_interface rtc_proc_interface = { +static struct class_interface rtc_proc_interface = { .add = &rtc_proc_add_device, .remove = &rtc_proc_remove_device, }; --- linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-sysfs.c.old 2006-02-25 04:52:49.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-sysfs.c 2006-02-25 04:52:58.000000000 +0100 @@ -97,7 +97,7 @@ /* interface registration */ -struct class_interface rtc_sysfs_interface = { +static struct class_interface rtc_sysfs_interface = { .add = &rtc_sysfs_add_device, .remove = &rtc_sysfs_remove_device, }; --- linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-test.c.old 2006-02-25 04:53:20.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/drivers/rtc/rtc-test.c 2006-02-25 04:53:28.000000000 +0100 @@ -14,7 +14,7 @@ #include <linux/rtc.h> #include <linux/platform_device.h> -struct platform_device *test0 = NULL, *test1 = NULL; +static struct platform_device *test0 = NULL, *test1 = NULL; static int test_rtc_read_alarm(struct device *dev, ^ permalink raw reply [flat|nested] 34+ messages in thread
* [-mm patch] kernel/fork.c: make signal_cachep static 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (9 preceding siblings ...) 2006-02-25 13:21 ` [-mm patch] drivers/rtc/: make some structs static Adrian Bunk @ 2006-02-25 13:24 ` Adrian Bunk 2006-02-25 13:27 ` [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static Adrian Bunk 2006-02-25 13:45 ` usbfs2 panic [Was: 2.6.16-rc4-mm2] Jiri Slaby 12 siblings, 0 replies; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:24 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-kernel, Oleg Nesterov On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > +copy_process-cleanup-bad_fork_cleanup_signal.patch >... > More core process/pid/thread updates from Oleg. >... signal_cachep can now become static. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- include/linux/slab.h | 1 - kernel/fork.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) --- linux-2.6.16-rc4-mm2-full/include/linux/slab.h.old 2006-02-25 04:48:29.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/include/linux/slab.h 2006-02-25 04:48:36.000000000 +0100 @@ -182,7 +182,6 @@ extern kmem_cache_t *files_cachep; extern kmem_cache_t *filp_cachep; extern kmem_cache_t *fs_cachep; -extern kmem_cache_t *signal_cachep; extern kmem_cache_t *sighand_cachep; extern kmem_cache_t *bio_cachep; --- linux-2.6.16-rc4-mm2-full/kernel/fork.c.old 2006-02-25 04:48:43.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/kernel/fork.c 2006-02-25 04:48:49.000000000 +0100 @@ -84,7 +84,7 @@ #endif /* SLAB cache for signal_struct structures (tsk->signal) */ -kmem_cache_t *signal_cachep; +static kmem_cache_t *signal_cachep; /* SLAB cache for sighand_struct structures (tsk->sighand) */ kmem_cache_t *sighand_cachep; ^ permalink raw reply [flat|nested] 34+ messages in thread
* [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (10 preceding siblings ...) 2006-02-25 13:24 ` [-mm patch] kernel/fork.c: make signal_cachep static Adrian Bunk @ 2006-02-25 13:27 ` Adrian Bunk 2006-02-25 14:31 ` Arnaldo Carvalho de Melo 2006-02-25 13:45 ` usbfs2 panic [Was: 2.6.16-rc4-mm2] Jiri Slaby 12 siblings, 1 reply; 34+ messages in thread From: Adrian Bunk @ 2006-02-25 13:27 UTC (permalink / raw) To: Andrew Morton, davem, acme; +Cc: linux-kernel, netdev On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: >... > Changes since 2.6.16-rc4-mm1: >... > git-net.patch >... > git trees. >... There's no reason for struct dccp_v4_prot being global. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- linux-2.6.16-rc4-mm2-full/net/dccp/ipv4.c.old 2006-02-25 04:32:45.000000000 +0100 +++ linux-2.6.16-rc4-mm2-full/net/dccp/ipv4.c 2006-02-25 04:32:53.000000000 +0100 @@ -1022,7 +1022,7 @@ .twsk_obj_size = sizeof(struct inet_timewait_sock), }; -struct proto dccp_v4_prot = { +static struct proto dccp_v4_prot = { .name = "DCCP", .owner = THIS_MODULE, .close = dccp_close, ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static 2006-02-25 13:27 ` [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static Adrian Bunk @ 2006-02-25 14:31 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 34+ messages in thread From: Arnaldo Carvalho de Melo @ 2006-02-25 14:31 UTC (permalink / raw) To: Adrian Bunk; +Cc: Andrew Morton, davem, acme, linux-kernel, netdev On 2/25/06, Adrian Bunk <bunk@stusta.de> wrote: > On Fri, Feb 24, 2006 at 03:10:02AM -0800, Andrew Morton wrote: > >... > > Changes since 2.6.16-rc4-mm1: > >... > > git-net.patch > >... > > git trees. > >... > > > There's no reason for struct dccp_v4_prot being global. > > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > --- linux-2.6.16-rc4-mm2-full/net/dccp/ipv4.c.old 2006-02-25 04:32:45.000000000 +0100 > +++ linux-2.6.16-rc4-mm2-full/net/dccp/ipv4.c 2006-02-25 04:32:53.000000000 +0100 > @@ -1022,7 +1022,7 @@ > .twsk_obj_size = sizeof(struct inet_timewait_sock), > }; > > -struct proto dccp_v4_prot = { > +static struct proto dccp_v4_prot = { > .name = "DCCP", > .owner = THIS_MODULE, > .close = dccp_close, Heck, the last series of patches were exactly to separate ipv4/ipv6 in DCCP more clearly, how could I forget the cherry on top (sticking this static in front of dccp_v4_prot)? Eagle eyes indeed. Thanks. - Arnaldo ^ permalink raw reply [flat|nested] 34+ messages in thread
* usbfs2 panic [Was: 2.6.16-rc4-mm2] 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton ` (11 preceding siblings ...) 2006-02-25 13:27 ` [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static Adrian Bunk @ 2006-02-25 13:45 ` Jiri Slaby 2006-02-25 18:05 ` Greg KH 12 siblings, 1 reply; 34+ messages in thread From: Jiri Slaby @ 2006-02-25 13:45 UTC (permalink / raw) To: Andrew Morton; +Cc: Linux kernel mailing list, Greg K-H Andrew Morton wrote: >ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ [...] Hello, I catched this oops through booting due to Greg's inode usbfs2 patch. Here is camera-snapshot of the screen: http://www.fi.muni.cz/~xslaby/sklad/panic.gif Config: http://www.fi.muni.cz/~xslaby/sklad/config-desk regards, -- Jiri Slaby www.fi.muni.cz/~xslaby \_.-^-._ jirislaby@gmail.com _.-^-._/ B67499670407CE62ACC8 22A032CC55C339D47A7E ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: usbfs2 panic [Was: 2.6.16-rc4-mm2] 2006-02-25 13:45 ` usbfs2 panic [Was: 2.6.16-rc4-mm2] Jiri Slaby @ 2006-02-25 18:05 ` Greg KH 0 siblings, 0 replies; 34+ messages in thread From: Greg KH @ 2006-02-25 18:05 UTC (permalink / raw) To: Jiri Slaby; +Cc: Andrew Morton, Linux kernel mailing list, Greg K-H On Sat, Feb 25, 2006 at 02:45:54PM +0100, Jiri Slaby wrote: > Andrew Morton wrote: > >ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc4/2.6.16-rc4-mm2/ > [...] > Hello, > > I catched this oops through booting due to Greg's inode usbfs2 patch. > Here is camera-snapshot of the screen: > http://www.fi.muni.cz/~xslaby/sklad/panic.gif > Config: > http://www.fi.muni.cz/~xslaby/sklad/config-desk Thanks. For now just disable usbfs2, or make it a module and don't load it. It is _very_ raw and as you see, doesn't work properly. And, in working on it some more, usbfs2 is not even going to be a file system, but instead just rely on device nodes, like usbfs does today. That will allow us to proper set ACLs and not force distros to have to mount yet-another-filesytem. thanks, greg k-h ^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2006-03-06 21:12 UTC | newest] Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-02-24 11:10 2.6.16-rc4-mm2 Andrew Morton 2006-02-24 16:27 ` [-mm PATCH] mips: fixed collision of rtc function name Yoichi Yuasa 2006-02-25 13:48 ` Atsushi Nemoto 2006-02-26 22:43 ` Yoichi Yuasa 2006-03-06 21:12 ` Ralf Baechle 2006-02-24 23:52 ` 2.6.16-rc4-mm2 Sam Ravnborg 2006-02-25 3:31 ` 2.6.16-rc4-mm2: drivers/rtc/utils.c should become part of a generic implementation Adrian Bunk 2006-02-25 4:46 ` Alessandro Zummo 2006-02-25 13:10 ` Adrian Bunk 2006-02-26 18:41 ` Alessandro Zummo 2006-02-26 18:55 ` Adrian Bunk 2006-02-26 20:02 ` Russell King 2006-03-03 22:26 ` Adrian Bunk 2006-02-25 3:38 ` 2.6.16-rc4-mm2: drivers/isdn/hysdn/hysdn_net.c module_param() compile error Adrian Bunk 2006-02-25 7:10 ` Rusty Russell 2006-02-25 7:22 ` Andrew Morton 2006-02-25 7:56 ` Rusty Russell 2006-02-25 3:47 ` oss/sonicvibes.c defines its own hweight32 Richard Knutsson 2006-02-25 4:11 ` 2.6.16-rc4-mm2: useless acpi_pmtmr_buggy Adrian Bunk 2006-02-25 11:59 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-25 12:17 ` 2.6.16-rc4-mm2 Andrew Morton 2006-02-25 12:25 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-25 12:31 ` 2.6.16-rc4-mm2 Andrew Morton 2006-02-25 12:41 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-25 15:51 ` 2.6.16-rc4-mm2 Jesper Juhl 2006-02-26 23:38 ` 2.6.16-rc4-mm2 Antonino A. Daplas 2006-02-25 13:15 ` [-mm patch] drivers/media/video/cpia2/cpia2_v4l.c cleanups Adrian Bunk 2006-02-25 13:18 ` [-mm patch] kernel/params.c: make param_array() static Adrian Bunk 2006-02-25 13:21 ` [-mm patch] drivers/rtc/: make some structs static Adrian Bunk 2006-02-25 13:24 ` [-mm patch] kernel/fork.c: make signal_cachep static Adrian Bunk 2006-02-25 13:27 ` [-mm patch] net/dccp/ipv4.c: make struct dccp_v4_prot static Adrian Bunk 2006-02-25 14:31 ` Arnaldo Carvalho de Melo 2006-02-25 13:45 ` usbfs2 panic [Was: 2.6.16-rc4-mm2] Jiri Slaby 2006-02-25 18:05 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).
