mmotm 2010-06-11-16-40 uploaded
Subsystems (3)
[email protected]
maintainerThe mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
It contains the following patches against 2.6.35-rc2:
origin.patch
linux-next.patch
next-remove-localversion.patch
i-need-old-gcc.patch
include-linux-fsh-complete-hexification-of-fmode_-constants.patch genalloc-fix-allocation-from-end-of-pool.patch
nommu-add-label-to-proc-pid-maps-output.patch
memcg-fix-wake-up-in-oom-wait-queue.patch
gxfb-fix-incorrect-__init-annotation.patch
lxfb-fix-incorrect-__init-annotation.patch
flat-tweak-default-stack-alignment.patch compiler-gcch-gcc-45-needs-noclone-and-noinline-on-__naked-functions.patch maintainers-update-files-for-samsung-arm-architectures.patch maintainers-add-git-trees-for-spi-and-device-tree.patch kexec-fix-oops-in-crash_shrink_memory.patch cpufreq-revert-remove-rwsem-lock-from-cpufreq_gov_stop-call-second-call-site.patch sched-prevent-compiler-from-optimising-sched_avg_update-loop.patch vfs-dont-hold-s_umount-over-close_bdev_exclusive-call.patch x86-i8259-only-register-sysdev-for-real-pic.patch
acerhdf-add-new-bios-versions.patch dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included.patch wmi-fix-memory-leak-in-parse_wdg.patch acer-wmi-hp-wmi-use-platform_device_unregister-instead-of-platform_device_del-in-module_exit.patch intel_menlow-fix-memory-leaks-in-error-path-fix.patch x86-cpufreq-make-trace_power_frequency-cpufreq-driver-independent.patch x86-cpufreq-make-trace_power_frequency-cpufreq-driver-independent-fix.patch x86-rwsem-stay-on-fast-path-when-count0-in-__up_write.patch
x86-rwsem-minor-cleanups.patch
x86-mm-create-symbolic-index-into-address_markers-array.patch x86-olpc-add-support-for-calling-into-openfirmware.patch compal-laptop-added-jhl90-battery-hwmon-interface.patch compal-laptop-uses-hwmon-interfaces-depends-on-hwmon.patch avr32-invoke-oom-killer-from-page-fault.patch
fs-btrfs-use-memdup_user.patch
fs-btrfs-use-err_cast.patch
cifs-provide-user-with-a-hint-when-name-resolution-fails.patch drivers-dma-eliminate-a-null-pointer-dereference.patch dib3000mc-reduce-large-stack-usage-fix.patch
drivers-media-use-memdup_user.patch
drivers-media-video-pvrusb2-add-missing-mutex_unlock.patch drivers-video-omap2-displays-add-missing-mutex_unlock.patch hpet-factor-timer-allocate-from-open.patch posix_timer-move-copy_to_usercreated_timer_id-down-in-timer_create.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix-sleep-inside-atomic.patch drivers-mfd-kzalloc-doesnt-return-err_ptr.patch
drivers-mfd-introduce-missing-kfree.patch
mtd-sst25l-check-for-null-consistently.patch score-fix-dereference-of-null-pointer-in-local_flush_tlb_page.patch fs-ubifs-use-err_cast.patch
3x59x-fix-pci-resource-management.patch
btusb-patch-add_apple_macbookpro62.patch
fs-ocfs2-dlm-add-missing-spin_unlock.patch altera_uart-simplify-altera_uart_console_putc-checkpatch-fixes.patch serial-fix-missing-bit-coverage-of-async_flags.patch serial-general-fixes-in-the-serial_rs485-structure.patch drivers-s390-net-use-memdup_user.patch percpu-online-cpu-before-memory-failed-in-pcpu_alloc_pages.patch percpu-fix-list_head-init-bug-in-__percpu_counter_init.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch
drivers-scsi-fnic-fnic_scsic-clean-up.patch drivers-scsi-lpfc-lpfc_vportc-fix-read-buffer-overflow.patch osst-fix-read-buffer-overflow.patch gdth-unmap-ccb_phys-when-scsi_add_host-fails-in-gdth_eisa_probe_one.patch drivers-scsi-libsas-use-sam_good.patch ncr5380-bit-mr_dma_mode-set-twice-in-ncr5380_transfer_dma.patch drivers-scsi-remove-unnecessary-null-test.patch drivers-message-move-dereference-after-null-test.patch
mpt-fusion-convert-to-seq_file.patch
g_ncr5380-remove-misleading-pnp-error-message.patch g_ncr5380-fix-broken-mmio-compilation.patch dc395x-decrease-iteration-for-tag_number-of-max_command-in-start_scsi.patch drivers-scsi-correct-the-size-argument-to-kmalloc.patch scsi-remove-superfluous-null-pointer-check-from-scsi_kill_request.patch scsi-sdc-quiet-all-sparse-noise.patch
lpfc-positive-error-return-into-negative.patch drivers-scsi-qla2xxx-qla_osc-fix-continuation-line-formats.patch scsi-bfa-correct-onstack-wait_queue_head-declaration.patch drivers-scsi-chc-dont-use-vprintk-as-macro.patch bfa-wrong-fcport-h2i-message-tested-in-bfa_fcport_isr.patch scsi-use-__ux-types-for-headers-exported-to-user-space.patch scsi-fix-pmcraid-build-errors.patch
scsi-fix-be2iscsi-build.patch
scsi-fix-bnx2i-build-errors.patch
scsi-remove-private-bit-macros.patch
drivers-scsi-use-memdup_user.patch
drivers-scsi-arcmsr-introduce-missing-kfree.patch
drivers-block-use-memdup_user.patch
floppy-make-controller-const.patch cciss-clean-up-interrupt-handler-make-sure-we-request-the-performant-mode-irq.patch cciss-add-performant-mode-support-for-stars-sirius-fix-call-to-put_controller_in_performant_mode.patch cciss-add-performant-mode-support-for-stars-sirius-move-next_command-function-from-ifdef.patch cciss-add-performant-mode-support-for-stars-sirius-remove-errant-debug-code.patch cciss-add-performant-mode-support-for-stars-sirius-change-pad-value-from-32-to-0.patch arch-sparc-kernel-eliminate-what-looks-like-a-null-pointer-dereference.patch drivers-staging-dream-camera-use-memdup_user.patch drivers-staging-vme-bridges-add-missing-unlocks.patch
drivers-usb-gadget-use-memdup_user.patch
virtio_9ph-include-linux-typesh.patch
vfs-improve-comment-describing-fget_light.patch
vfs-o_-bit-numbers-uniqueness-check.patch vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch vfs-clarify-that-nonseekable_open-will-never-fail.patch vfs-use-kmalloc-to-allocate-fdmem-if-possible.patch modpost-support-objects-with-more-than-64k-sections.patch
mm.patch
mm-use-memdup_user.patch
mm-use-err_cast.patch
mm-provide-init_mm-mm_context-initializer.patch
fs-move-code-out-of-bufferc.patch tmpfs-quick-token-library-to-allow-scalable-retrieval-of-tokens-from-token-jar.patch tmpfs-make-tmpfs-scalable-with-caches-for-free-blocks.patch hugetlb-call-mmu-notifiers-on-hugepage-cow.patch kmap_atomic-make-kunmap_atomic-harder-to-misuse.patch
mm-vmap-area-cache.patch
mm-vmap-area-cache-fix.patch
define-madv_hugepage.patch
mm-rename-anon_vma_lock-to-vma_lock_anon_vma.patch mm-change-direct-call-of-spin_lockanon_vma-lock-to-inline-function.patch mm-track-the-root-oldest-anon_vma.patch
mm-track-the-root-oldest-anon_vma-fix.patch
mm-always-lock-the-root-oldest-anon_vma.patch mm-extend-ksm-refcounts-to-the-anon_vma-root.patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch buffer_head-remove-redundant-test-from-wait_on_buffer.patch oom-check-pf_kthread-instead-of-mm-to-skip-kthreads.patch oom-pf_exiting-check-should-take-mm-into-account.patch oom-introduce-find_lock_task_mm-to-fix-mm-false-positives.patch oom-dump_tasks-use-find_lock_task_mm-too.patch
oom-improve-commentary-in-dump_tasks.patch oom-dump_tasks-use-find_lock_task_mm-too-dump_tasks-use-find_lock_task_mm-too-fix.patch oom-give-current-access-to-memory-reserves-if-it-has-been-killed.patch oom-avoid-sending-exiting-tasks-a-sigkill.patch oom-filter-tasks-not-sharing-the-same-cpuset.patch oom-sacrifice-child-with-highest-badness-score-for-parent.patch oom-sacrifice-child-with-highest-badness-score-for-parent-protect-dereferencing-of-tasks-comm.patch oom-sacrifice-child-with-highest-badness-score-for-parent-fix.patch oom-select-task-from-tasklist-for-mempolicy-ooms.patch oom-select-task-from-tasklist-for-mempolicy-ooms-add-has_intersects_mems_allowed-uma-variant.patch oom-select-task-from-tasklist-for-mempolicy-ooms-introduce-find_lock_task_mm-to-fix-mm-false-positives-fix.patch oom-enable-oom-tasklist-dump-by-default.patch oom-avoid-oom-killer-for-lowmem-allocations.patch
oom-extract-panic-helper-function.patch
oom-remove-special-handling-for-pagefault-ooms.patch oom-move-sysctl-declarations-to-oomh.patch
oom-remove-unnecessary-code-and-cleanup.patch mm-rename-try_set_zone_oom-to-try_set_zonelist_oom.patch oom-remove-constraint-argument-from-select_bad_process-and-__out_of_memory.patch oom-fold-__out_of_memory-into-out_of_memory.patch
mm-use-for_each_online_cpu-in-vmstat.patch ummunotify-userspace-support-for-mmu-notifications-v2.patch frv-duplicate-output_buffer-of-e03.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch alpha-add-performance-monitor-interrupt-counter.patch alpha-add-wrperfmonh-header-file-to-aid-use-of-wrperfmon-palcall.patch alpha-implement-hw-performance-events-on-the-ev67-and-later-cpus.patch asm-generic-ioh-add-big-endian-versions-of-ioreadwrite1632.patch include-linux-compiler-gcch-use-__same_type-in-__must_be_array.patch alpha-h8300-m68k-remove-obsolete-asm-mdh-files.patch kernelh-remove-unused-nipquad-and-nipquad_fmt.patch kernelh-add-hw_err-printk-prefix-for-hardware-error-logging.patch x86-use-hw_err-in-mce-handler.patch
misc-rohm-bh1780gli-ambient-light-sensor-driver.patch sys_personality-remove-the-bogus-checks-in-sys_personality-__set_personality-path.patch kernel-range-remove-unused-definition-of-array_size.patch char-add-warn_on-in-misc_deregister.patch s390-remove-warn_on-for-misc_deregister-failures.patch maintainers-update-arm-bcmring-mtd-nand-driver-file-patterns.patch maintainers-update-arm-nuvoton-w90x900-arm-architecture-file-patterns.patch maintainers-update-arm-voipac-pxa270-file-patterns.patch maintainers-update-arm-zipit-z2-support-file-patterns.patch maintainers-update-networking-file-patterns.patch maintainers-update-ppp-over-l2tp-file-patterns.patch maintainers-update-ricoh-smartmedia-xd-driver-file-patterns.patch maintainers-remove-section-smx-uio-interface.patch maintainers-update-spear-clock-framework-support-file-patterns.patch maintainers-remove-section-strip.patch maintainers-remove-section-wavelan-network-driver-wireless-extensions.patch maintainers-add-file-patterns-to-uclinux-for-renesas-h8-300.patch maintainers-update-drm-drivers-patterns.patch
mmc-recognize-csd-structure.patch
mmc-recognize-csd-structure-fix.patch
mmc-split-mmc_sd_init_card.patch
mmc-implement-sd-combo-iomem-support.patch s5pc110-sdhci-s3c-can-override-host-capabilities.patch s5pc110-sdhci-s3c-support-on-s5pc110.patch
sdhci-add-no-hi-speed-bit-quirk-support.patch checkpatch-refactor-allowed-asm-includes-and-add-memoryh.patch hwmon-add-driver-for-smsc-emc2103-temperature-monitor-and-fan-controller.patch drivers-hwmon-hdapsc-add-lenovo-thinkpad-t400-to-the-whitelist.patch rwsem-fully-separate-code-pathes-to-wake-writers-vs-readers.patch rwsem-lighter-active-count-checks-when-waking-up-readers.patch rwsem-let-rwsem_waiting_bias-represent-any-number-of-waiting-threads.patch rwsem-wake-queued-readers-when-writer-blocks-on-active-read-lock.patch rwsem-smaller-wrappers-around-rwsem_down_failed_common.patch drivers-message-i2o-exec-osmc-add-missing-mutex_unlock.patch autofs4-remove-unneeded-null-check-in-try_to_fill_dentry.patch nuc900-rtc-change-the-waiting-for-device-ready-implement.patch rtc-nuc900-fix-checking-of-args-during-time-setting.patch drivers-rtc-rtc-pcf8563c-remove-unused-struct.patch
rtc-pxa-remove-unused-field.patch
rtc-m48t59-kfreenull-is-ok.patch
rtc-rtc-mxc-remove-six-unused-fields.patch
rtc-fixes-and-new-functionality-for-fm3130.patch rtc-fixes-and-new-functionality-for-fm3130-fix.patch rtc-pxa-remove-unnecessary-private-ops-ioctl.patch drivers-rtc-rtc-pl031c-remove-unused-include-linux-versionh.patch rtc-driver-for-the-dryice-block-found-in-imx25-chips.patch hfsplus-identify-journal-info-block-in-volume-header.patch
hfsplus-fix-journal-detection.patch
fusion-fix-kernel-doc-warnings.patch
timerc-fix-kernel-doc-warning.patch
mtd-nand_base-fix-kernel-doc-warnings-typos.patch documentation-networking-wavelantxt-deleted-not-in-tree.patch blkdev-cgroup-whitelist-permission-fix.patch memcg-remove-experimental-from-swap-account-config.patch memcg-clean-up-try_charge-main-loop-v2.patch
memcg-clean-up-waiting-move-acct-v2.patch
memcg-remove-redundant-codes.patch
memcg-remove-mem-from-arg-of-charge_common.patch
signals-introduce-send_sigkill-helper.patch drivers-char-n_gsmc-add-missing-spin_unlock_irqrestore.patch
char-remove-unused-variable.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch delayacct-align-to-8-byte-boundary-on-64-bit-systems.patch edac-add-wissing-pieces-from-mpc85xx-fsl_soc_booke.patch panic-keep-blinking-in-spite-of-long-spin-timer-mode.patch panic-keep-blinking-in-spite-of-long-spin-timer-mode-update.patch aio-always-reinitialize-iocb-ki_run_list-at-the-end-of-aio_run_iocb.patch kfifo-kfifo_is_fullempty-should-return-bools-not-ints.patch kfifo-fix-kfifo-miss-use-of-nozamic.patch
kfifo-add-the-new-generic-kfifo-api.patch
kfifo-replace-the-old-non-generic-api.patch kfifo-add-example-files-to-the-kernel-sample-directory.patch kfifo-add-example-files-to-the-kernel-sample-directory-checkpatch-fixes.patch lib-decompress_bunzip2c-fix-checkstack-warning.patch
time-kill-off-config_generic_time.patch
vfs-add-super-operation-writeback_inodes.patch
vfs-take-2add-set_page_dirty_notag.patch
reiser4-export-remove_from_page_cache.patch
reiser4-export-remove_from_page_cache-fix.patch
reiser4-export-find_get_pages.patch
reiser4.patch
reiser4-writeback_inodes-implementation.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixup-checkin-checkout-jnodes-for-entd.patch
reiser4-fixups.patch
reiser4-broke.patch
make-sure-nobodys-leaking-resources.patch
journal_add_journal_head-debug.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch mutex-subsystem-synchro-test-module-add-missing-header-file.patch
slab-leaks3-default-y.patch
put_bh-debug.patch
add-debugging-aid-for-memory-initialisation-problems.patch workaround-for-a-pci-restoring-bug.patch
prio_tree-debugging-patch.patch
single_open-seq_release-leak-diagnostics.patch
add-a-refcount-check-in-dput.patch
getblk-handle-2tb-devices.patch
Andrew Morton
maintainerQuoted 7 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
This oopses for me in get_ksymbol() (a linux-next bug). I didn't have time to find out why. But presumably it isn't oopsing for other linux-next testers.
Andrew Morton
maintainerQuoted 7 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
This oopses for me in get_ksymbol() (a linux-next bug). I didn't have time to find out why. But presumably it isn't oopsing for other linux-next testers.
Quoted 4 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
Quoted 8 lines
and will soon be available at
git://zen-kernel.org/kernel/mmotm.gitIt contains the following patches against 2.6.35-rc2:
mm-extend-ksm-refcounts-to-the-anon_vma-root.patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
latter patch file contains patches to mm/rmap.c.orig, which patch FAILs to apply:
Applying patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
patching file mm/rmap.c
patching file mm/rmap.c.orig
Hunk #1 FAILED at 236.
Hunk #2 succeeded at 253 with fuzz 2 (offset -12 lines).
Hunk #3 succeeded at 1343 (offset -58 lines).
1 out of 3 hunks FAILED -- rejects in file mm/rmap.c.orig
Patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch does not apply (enforce with -f)
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
Andrew Morton
maintainerQuoted 10 lines · On Fri, 11 Jun 2010 18:31:52 -0700 Randy Dunlap <[email protected]> wrote:
Quoted 8 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
Quoted 7 lines
Quoted 4 lines
It contains the following patches against 2.6.35-rc2:
mm-extend-ksm-refcounts-to-the-anon_vma-root.patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
latter patch file contains patches to
mm/rmap.c.orig, which patch FAILs to apply:
Geeze I hate it when people do that. My "work out what files are added or removed or altered by a patch" script needs fixing.
Quoted 8 lines · On Sat, Jun 12, 2010 at 7:40 AM, <[email protected]> wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
Hi, andrew
building failed with:
AS arch/x86/kernel/entry_32.o/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: Assembler messages:/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: Error:
no such instruction: `static inline void olpc_ofw_detect_range(void){}'
make[2]: *** [arch/x86/kernel/entry_32.o] Error 1
make[1]: *** [arch/x86/kernel] Error 2
make: *** [arch/x86] Error 2
Attached a patch to fix it (I have not appropriate email client now, sorry for the inconvenience )
add "ifndef __ASSEMBLER__" to fix build warnings
Fix build failing of olpc_ofw.h
Add ifndef __ASSEMBLER__ around the function declaration
--- arch/x86/include/asm/olpc_ofw.h | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/include/asm/olpc_ofw.h +2 -0
@@ -26,7 +26,9 @@ void olpc_ofw_detect_range(void);#else +#ifndef __ASSEMBLER__static inline void olpc_ofw_detect_range (void ) { } +#endif #endif
Andrew Morton
maintainerQuoted 22 lines · On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young <[email protected]> wrote:
Quoted 8 lines · On Sat, Jun 12, 2010 at 7:40 AM, <[email protected]> wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
__ http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
__
git://zen-kernel.org/kernel/mmotm.gitHi, andrew
building failed with:
ASarch/x86/kernel/entry_32.o/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: Assembler messages:/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: Error:
no such instruction: `static inline void olpc_ofw_detect_range(void){}'
make[2]: *** [arch/x86/kernel/entry_32.o] Error 1
make[1]: *** [arch/x86/kernel] Error 2
make: *** [arch/x86] Error 2
Quoted 2 lines
Attached a patch to fix it (I have not appropriate email client now, sorry for the inconvenience )
Thanks.
We can simplify things a bit I think...
#ifndef _ASM_X86_OLPC_OFW_H
#define _ASM_X86_OLPC_OFW_H
/* hardcode addresses to make life easier dealing w/ VMALLOC_END and others */ #define OLPC_OFW_START 0xff800000UL
#define OLPC_OFW_SIZE (PGDIR_SIZE)
#define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE)
#ifndef __ASSEMBLER__
#ifdef CONFIG_OLPC_OPENFIRMWARE
/* address of OFW callback interface; will be NULL if OFW isn't found */ extern int (*olpc_ofw_cif)(int *);
/* page dir entry containing OFW's current memory */ extern pgdval_t olpc_ofw_pgd;
/* run an OFW command by calling into the firmware */ extern int olpc_ofw(const char *name, int nr_args, int nr_res, ...);
/* determine/ensure OFW lives in the proper place in (virtual) memory */ void olpc_ofw_detect_range(void);
#else /* CONFIG_OLPC_OPENFIRMWARE */
static inline void olpc_ofw_detect_range(void) { }
#endif /* CONFIG_OLPC_OPENFIRMWARE */
#endif /* __ASSEMBLER__ */
#endif
arch/x86/include/asm/olpc_ofw.h renamed from arch/x86/include/asm/olpc_ofw.h~x86-olpc-add-support-for-calling-into-openfirmware-fix-fix +6 -8
@@ -6,10 +6,10 @@#define OLPC_OFW_SIZE (PGDIR_SIZE)#define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE) -#ifdef CONFIG_OLPC_OPENFIRMWARE -#ifndef __ASSEMBLER__ +#ifdef CONFIG_OLPC_OPENFIRMWARE +/* address of OFW callback interface; will be NULL if OFW isn't found */ extern int (*olpc_ofw_cif)(int *);
@@ -22,14 +22,12 @@ extern int olpc_ofw(const char *name, in/* determine/ensure OFW lives in the proper place in (virtual) memory */ void olpc_ofw_detect_range (void ); -#endif - -#else +#else /* CONFIG_OLPC_OPENFIRMWARE */ -#ifndef __ASSEMBLER__static inline void olpc_ofw_detect_range (void ) { } -#endif -#endif +#endif /* CONFIG_OLPC_OPENFIRMWARE */ + +#endif /* __ASSEMBLER__ */ #endif
_
Quoted 59 lines · On Fri, 11 Jun 2010 19:54:21 -0700 Andrew Morton <[email protected]>…
Quoted 23 lines · On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young <[email protected]> wrote:
Quoted 9 lines · On Sat, Jun 12, 2010 at 7:40 AM, <[email protected]> wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
__ http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
__
git://zen-kernel.org/kernel/mmotm.gitHi, andrew
building failed with:
ASarch/x86/kernel/entry_32.o/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:
Assembler
messages:/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29:
Error: no such instruction: `static inline void olpc_ofw_detect_range(void){}' make[2]: *** [arch/x86/kernel/entry_32.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2Quoted 2 lines
Attached a patch to fix it (I have not appropriate email client now, sorry for the inconvenience )
Thanks.
We can simplify things a bit I think...
#ifndef
_ASM_X86_OLPC_OFW_H
#define_ASM_X86_OLPC_OFW_H/* hardcode addresses to make life easier dealing w/
VMALLOC_ENDand others */ #defineOLPC_OFW_START0xff800000UL
#defineOLPC_OFW_SIZE(PGDIR_SIZE)
#defineOLPC_OFW_END(OLPC_OFW_START+OLPC_OFW_SIZE)#ifndef
__ASSEMBLER__#ifdef
CONFIG_OLPC_OPENFIRMWARE/* address of OFW callback interface; will be NULL if OFW isn't found */ extern int (*olpc_ofw_cif)(int *);
/* page dir entry containing OFW's current memory */ extern
pgdval_tolpc_ofw_pgd;/* run an OFW command by calling into the firmware */ extern int
olpc_ofw(const char *name, int nr_args, int nr_res, ...);/* determine/ensure OFW lives in the proper place in (virtual) memory */ void
olpc_ofw_detect_range(void);#else /*
CONFIG_OLPC_OPENFIRMWARE*/
Quoted 8 lines
static inline void
olpc_ofw_detect_range(void){ }#endif /*
CONFIG_OLPC_OPENFIRMWARE*/#endif /*
__ASSEMBLER__*/#endif
Thanks, I've changed it to something similar in my git tree. It'll be in the next patch (once I've addressed hpa's concerns).
Re: mmotm 2010-06-11-16-40 uploaded - busticated patch?
In reply to [email protected]Quoted 3 lines · On Fri, 11 Jun 2010 16:40:13 PDT, [email protected] said:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch contains this hunk:
mm/rmap.c.orig renamed from mm/rmap.c.orig~mm-extend-ksm-refcounts-to-the-anon_vma-root-fix +0 -0
which blows chunks because there's no rmap.c.orig in the tree. Not sure what that section was supposed to do, or what it was supposed to apply to.
Hi Andrew,
Quoted 8 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
git://zen-kernel.org/kernel/mmotm.git
The version in this git tree stops just before patch scsi-remove-private-bit-macros.patch. I suspect that is because "git am" doe not like that patch (it has "a/./drivers..." as the file names).
There are a few later patches that "git am" also does not like - because either they have no commit message, no From: line, or do not apply without some fuzz.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Andrew Morton
maintainerQuoted 8 lines · On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <[email protected]>…
Hi Andrew,
Quoted 5 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
Quoted 7 lines
Quoted 3 lines
and will soon be available at
git://zen-kernel.org/kernel/mmotm.gitThe version in this git tree stops just before patch scsi-remove-private-bit-macros.patch. I suspect that is because "git am" doe not like that patch (it has "a/./drivers..." as the file names).
git bug. I fixed the patch.
Quoted 2 lines
There are a few later patches that "git am" also does not like - because either they have no commit message
That should be OK - we often have unchangelogged patches. Real simple ones.
Quoted 1 line
, no From: line,
Well. What From: line do I put on origin.patch and linux-next.patch??
I fixed the others.
Quoted 2 lines
or do not apply
without some fuzz.
That's a bit silly. Oh well, I can try to remember to rediff everything before uploading.
Hi Andrew,
Quoted 11 lines · On Sat, 12 Jun 2010 10:10:14 -0700 Andrew Morton <[email protected]>…
Quoted 8 lines · On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <[email protected]>…
Quoted 7 lines · On Fri, 11 Jun 2010 16:40:13 -0700 [email protected] wrote:
The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
http://userweb.kernel.org/~akpm/mmotm/
and will soon be available at
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
git://zen-kernel.org/kernel/mmotm.gitThe version in this git tree stops just before patch scsi-remove-private-bit-macros.patch. I suspect that is because "git am" doe not like that patch (it has "a/./drivers..." as the file names).
git bug. I fixed the patch.
Yeah, these comments were more reflections on the "import to git" procedures than on the patches themselves.
Quoted 3 lines
Quoted 1 line
, no From: line,
Well. What From: line do I put on origin.patch and linux-next.patch??
They were not the problem (for me at least).
Quoted 1 line
I fixed the others.
Thanks.
Quoted 5 lines
Quoted 2 lines
or do not apply
without some fuzz.That's a bit silly. Oh well, I can try to remember to rediff everything before uploading.
Not really necessary, git am is a but anal in that regard (for good reason usually).
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/