- 14 Feb, 2010 9 commits
-
-
Grant Likely authored
Neither request_OF_resource or release_OF_resource are defined anywhere. Remove the declarations. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Grant Likely authored
Both allnodes and devtree_lock are defined in common code. The extern declaration should be in the common header too so that the compiler can type check. allnodes is already in of.h, but devtree_lock should be declared there too. This patch removes the SPARC declarations and uses decls in of.h instead. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu> Acked-by:
David S. Miller <davem@davemloft.net>
-
Grant Likely authored
Rather than defining of_chosen in each arch, it can be defined for all in driver/of/base.c Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Grant Likely authored
Neither the powerpc nor the microblaze code use devtree_lock anymore. Remove the extern reference. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Grant Likely authored
Most architectures don't need to change these. Put them into common code to eliminate some duplication Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Jeremy Kerr authored
We don't always have lmb available, so make arches provide an early_init_dt_alloc_memory_arch() to handle the allocation of memory in the fdt code. When we don't have lmb.h included, we need asm/page.h for __va. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Jeremy Kerr authored
For platforms that have CONFIG_OF optional, we need to make the contents of linux/of.h conditional on CONFIG_OF. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Jeremy Kerr authored
Commit e22f6283 introduced a build breakage for ARM devtree work: the THIS_MODULE macro was added, but we don't have module.h This change adds the necessary #include to get THIS_MODULE defined. While we could just replace it with NULL (PROC_FS is a bool, not a tristate), using THIS_MODULE will prevent unexpected breakage if we ever do compile this as a module. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Grant Likely authored
The following functions don't exist: finish_device_tree() print_properties() prom_n_intr_cells() prom_get_irq_senses() The following functions are in drivers/of/base.c, so the declaration belongs in of.h instead of of_fdt.h of_machine_is_compatible() prom_add_property() prom_remove_property() prom_update_property() Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by:
Michal Simek <monstr@monstr.eu>
-
- 09 Feb, 2010 14 commits
-
-
David Gibson authored
Currently when processing flattened device trees, the kernel expects the phandle in a property called "linux,phandle". The ePAPR spec - not being Linux specific - instead requires phandles to be encoded in a property named simply "phandle". This patch makes the kernel accept either form when unflattening the device tree. Signed-off-by:
David Gibson <david@gibson.dropbear.id.au> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
The boot_param_header has big-endian fields, so change the types to __be32, and perform endian conversion when we access them. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
Properties in the device tree are specified as big-endian. At present, the only platforms to support device trees are also big-endian, so we've been acessing the properties as raw values. We'd like to add device tree support to little-endian platforms too, so add endian conversion to the sites where we access property values in the common of code. Compiled on powerpc (ppc44x_defconfig & ppc64_defconfig) and arm (fdt support only for now). Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
Currently, we're using u32 for cell values, and hence assuming host-endian device trees. As we'd like to support little-endian platforms, use a __be32 for cell values, and convert in the cell accessors. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
At present we're using hard-coded values for defaults when parsing the FDT. This change uses the #defines instead. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
At present, the fdt code sets the kernel-wide initrd_start and initrd_end variables when parsing /chosen. On ARM, we only set these once the bootmem has been reserved. This change adds an arch hook to setup the initrd from the device tree: void early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end); The arch-specific code can then setup the initrd however it likes. Compiled on powerpc, with CONFIG_BLK_DEV_INITRD=y and =n. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
Currenly, proc_devtree.c depends on asm/prom.h to include linux/of.h, to provide some device-tree definitions (eg, struct property). Instead, include linux/of.h directly. We still need asm/prom.h for HAVE_ARCH_DEVTREE_FIXUPS. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
We only need set_node_proc_entry in proc_devtree.c, so move it there. This fixes the !HAVE_ARCH_DEVTREE_FIXUPS build, as we can't make make the definition in linux/of.h conditional on this #define (definitions in asm/prom.h can't be exposed to linux/of.h, due to the enforced #include ordering). Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Jeremy Kerr authored
We use a few procfs-specific functions (eg, proc_device_tree_*) which aren't covered by the current includes. This causes the following build error on arm: drivers/of/base.c: In function 'prom_add_property': drivers/of/base.c:861: error: implicit declaration of function 'proc_device_tree_add_prop' drivers/of/base.c: In function 'prom_remove_property': drivers/of/base.c:902: error: implicit declaration of function 'proc_device_tree_remove_prop' drivers/of/base.c: In function 'prom_update_property': drivers/of/base.c:946: error: implicit declaration of function 'proc_device_tree_update_prop' Add proc_fs.h for these prototypes. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Grant Likely authored
Merge common code between PowerPC and Microblaze architectures. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Grant Likely authored
machine is compatible is an OF-specific call. It should have the of_ prefix to protect the global namespace. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Michal Simek <monstr@monstr.eu>
-
Jeremy Kerr authored
Merge common function between powerpc, sparc and microblaze. Code is identical for powerpc and microblaze, but adds a lock (and release) of the devtree_lock on sparc. Signed-off-by:
Jeremy Kerr <jeremy.kerr@canonical.com> Signed-off-by:
Grant Likely <grant.likely@secretlab.ca>
-
Grant Likely authored
Merge common code between PowerPC and Microblaze Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Tested-by:
Wolfram Sang <w.sang@pengutronix.de> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-
Grant Likely authored
Microblaze only has one CPU, it isn't SMP at all. early_init_dt_scan_cpus() is effectively just a no-op, so remove it. Microblaze doesn't support hypervisor assisted dump either, so the phyp stuff can also go. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
Michal Simek <monstr@monstr.eu>
-
- 28 Jan, 2010 4 commits
-
-
Grant Likely authored
-
Grant Likely authored
In struct device_node, the phandle is named 'linux_phandle' for PowerPC and MicroBlaze, and 'node' for SPARC. There is no good reason for the difference, it is just an artifact of the code diverging over a couple of years. This patch renames both to simply .phandle. Note: the .node also existed in PowerPC/MicroBlaze, but the only user seems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn't look like the assignment between .linux_phandle and .node is significantly different enough to warrant the separate code paths unless ibm,phandle properties actually appear in Apple device trees. I think it is safe to eliminate the old .node property and use phandle everywhere. Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Acked-by:
David S. Miller <davem@davemloft.net> Tested-by:
Wolfram Sang <w.sang@pengutronix.de> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-
Grant Likely authored
Merge common code between PowerPC and MicroBlaze Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Tested-by:
Wolfram Sang <w.sang@pengutronix.de> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-
Grant Likely authored
Merge common code between PowerPC and Microblaze Signed-off-by:
Grant Likely <grant.likely@secretlab.ca> Tested-by:
Wolfram Sang <w.sang@pengutronix.de> Acked-by:
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-
- 21 Jan, 2010 13 commits
-
-
Linus Torvalds authored
-
Linus Torvalds authored
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: x86: Add support for the ANY bit perf: Change the is_software_event() definition perf: Honour event state for aux stream data perf: Fix perf_event_do_pending() fallback callsite perf kmem: Print usage help for unknown commands perf kmem: Increase "Hit" column length hw-breakpoints, perf: Fix broken mmiotrace due to dr6 by reference change perf timechart: Use tid not pid for COMM change
-
Linus Torvalds authored
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Reassign prev and switch_count when reacquire_kernel_lock() fail sched: Fix vmark regression on big machines
-
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-devLinus Torvalds authored
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: retry FS IOs even if it has failed with AC_ERR_INVALID
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: fix race in tty_fasync serial: serial_cs: oxsemi quirk breaks resume serial: imx: bit &/| confusion serial: Fix crash if the minimum rate of the device is > 9600 baud serial-core: resume serial hardware with no_console_suspend serial: 8250_pnp: use wildcard for serial Wacom tablets nozomi: quick fix for the close/close bug compat_ioctl: Supress "unknown cmd" message on serial /dev/console
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: hv: fix smp problems in the hyperv core code Staging: et131x: Fix 2.6.33rc1 regression in et131x Staging: asus_oled: fix oops in 2.6.32.2
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Revert "sysdev: fix prototype for memory_sysdev_class show/store functions" driver-core: fix devtmpfs crash on s390
-
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: isp1362: fix build failure on ARM systems via irq_flags cleanup USB: isp1362: better 64bit printf warning fixes USB: fix usbstorage for 2770:915d delivers no FAT USB: Fix level of isp1760 Reloading ptd error message USB: FHCI: avoid NULL pointer dereference USB: Fix duplicate sysfs problem after device reset. USB: add speed values for USB 3.0 and wireless controllers USB: add missing delay during remote wakeup USB: EHCI & UHCI: fix race between root-hub suspend and port resume USB: EHCI: fix handling of unusual interrupt intervals USB: Don't use GFP_KERNEL while we cannot reset a storage device USB: fix bitmask merge error usb: serial: fix memory leak in generic driver USB: serial: fix USB serial fix kfifo_len locking
-
git://git.kernel.dk/linux-2.6-blockLinus Torvalds authored
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: fs/bio.c: fix shadows sparse warning drbd: The kernel code is now equivalent to out of tree release 8.3.7 drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced) drbd: Don't go into StandAlone mode when authentification failes because of network error drivers/block/drbd/drbd_receiver.c: correct NULL test cfq-iosched: Respect ioprio_class when preempting genhd: overlapping variable definition block: removed unused as_io_context DM: Fix device mapper topology stacking block: bdev_stack_limits wrapper block: Fix discard alignment calculation and printing block: Correct handling of bottom device misaligment drbd: check on CONFIG_LBDAF, not LBD drivers/block/drbd: Correct NULL test drbd: Silenced an assert that could triggered after changing write ordering method drbd: Kconfig fix drbd: Fix for a race between IO and a detach operation [Bugz 262] drbd: Use drbd_crypto_is_hash() instead of an open coded check
-
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6Linus Torvalds authored
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (23 commits) ACPI: delete acpi_processor_power_verify_c2() ACPI: allow C3 > 1000usec ACPI: enable C2 and Turbo-mode on Nehalem notebooks on A/C ACPI: power_meter: remove double kfree() ACPI: processor: restrict early _PDC to opt-in platforms ACPI: Fix unused variable warning in sbs.c acpi: make ACPI device id constant sony-laptop - fix using of uninitialized variable ACPI: Fix section mismatch error for acpi_early_processor_set_pdc() eeepc-laptop: disable wireless hotplug for 1201N eeepc-laptop: add hotplug_disable parameter eeepc-laptop: switch to using sparse keymap library eeepc-laptop: dmi blacklist to disable pci hotplug code eeepc-laptop: disable cpu speed control on EeePC 701 ACPI: don't cond_resched if irq is disabled ACPI: Remove unnecessary cast. ACPI: Advertise to BIOS in _OSC: _OST on _PPC changes ACPI: EC: Add wait for irq storm ACPI: SBS: Move SBS HC callback to faster Notify queue x86, ACPI: delete acpi_boot_table_init() return value ...
-
git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6Linus Torvalds authored
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: ecryptfs: use after free ecryptfs: Eliminate useless code ecryptfs: fix interpose/interpolate typos in comments ecryptfs: pass matching flags to interpose as defined and used there ecryptfs: remove unnecessary d_drop calls in ecryptfs_link ecryptfs: don't ignore return value from lock_rename ecryptfs: initialize private persistent file before dereferencing pointer eCryptfs: Remove mmap from directory operations eCryptfs: Add getattr function eCryptfs: Use notify_change for truncating lower inodes
-
git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstableLinus Torvalds authored
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: fix possible panic on unmount Btrfs: deal with NULL acl sent to btrfs_set_acl Btrfs: fix regression in orphan cleanup Btrfs: Fix race in btrfs_mark_extent_written Btrfs, fix memory leaks in error paths Btrfs: align offsets for btrfs_ordered_update_i_size btrfs: fix missing last-entry in readdir(3)
-
Yongseok Koh authored
In free_unmap_area_noflush(), va->flags is marked as VM_LAZY_FREE first, and then vmap_lazy_nr is increased atomically. But, in __purge_vmap_area_lazy(), while traversing of vmap_are_list, nr is counted by checking VM_LAZY_FREE is set to va->flags. After counting the variable nr, kernel reads vmap_lazy_nr atomically and checks a BUG_ON condition whether nr is greater than vmap_lazy_nr to prevent vmap_lazy_nr from being negative. The problem is that, if interrupted right after marking VM_LAZY_FREE, increment of vmap_lazy_nr can be delayed. Consequently, BUG_ON condition can be met because nr is counted more than vmap_lazy_nr. It is highly probable when vmalloc/vfree are called frequently. This scenario have been verified by adding delay between marking VM_LAZY_FREE and increasing vmap_lazy_nr in free_unmap_area_noflush(). Even the vmap_lazy_nr is for checking high watermark, it never be the strict watermark. Although the BUG_ON condition is to prevent vmap_lazy_nr from being negative, vmap_lazy_nr is signed variable. So, it could go down to negative value temporarily. Consequently, removing the BUG_ON condition is proper. A possible BUG_ON message is like the below. kernel BUG at mm/vmalloc.c:517! invalid opcode: 0000 [#1] SMP EIP: 0060:[<c04824a4>] EFLAGS: 00010297 CPU: 3 EIP is at __purge_vmap_area_lazy+0x144/0x150 EAX: ee8a8818 EBX: c08e77d4 ECX: e7c7ae40 EDX: c08e77ec ESI: 000081fe EDI: e7c7ae60 EBP: e7c7ae64 ESP: e7c7ae3c DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Call Trace: [<c0482ad9>] free_unmap_vmap_area_noflush+0x69/0x70 [<c0482b02>] remove_vm_area+0x22/0x70 [<c0482c15>] __vunmap+0x45/0xe0 [<c04831ec>] vmalloc+0x2c/0x30 Code: 8d 59 e0 eb 04 66 90 89 cb 89 d0 e8 87 fe ff ff 8b 43 20 89 da 8d 48 e0 8d 43 20 3b 04 24 75 e7 fe 05 a8 a5 a3 c0 e9 78 ff ff ff <0f> 0b eb fe 90 8d b4 26 00 00 00 00 56 89 c6 b8 ac a5 a3 c0 31 EIP: [<c04824a4>] __purge_vmap_area_lazy+0x144/0x150 SS:ESP 0068:e7c7ae3c [ See also http://marc.info/?l=linux-kernel&m=126335856228090&w=2 ] Signed-off-by:
Yongseok Koh <yongseok.koh@samsung.com> Reviewed-by:
Minchan Kim <minchan.kim@gmail.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Linus Torvalds <torvalds@linux-foundation.org>
-