summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* x86: early_printk.c - fix pgtable.h unification falloutIngo Molnar2009-02-091-0/+1
| | | | | | | | | arch/x86/kernel/early_printk.c: In function ‘early_dbgp_init’: arch/x86/kernel/early_printk.c:827: error: ‘PAGE_KERNEL_NOCACHE’ undeclared (first use in this function) arch/x86/kernel/early_printk.c:827: error: (Each undeclared identifier is reported only once arch/x86/kernel/early_printk.c:827: error: for each function it appears in.) Signed-off-by: Ingo Molnar <mingo@elte.hu>
* Merge branch 'jsgf/x86/unify' of ↵Ingo Molnar2009-02-0910-294/+280
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
| * x86: Fix compile error in arch/x86/kernel/early_printk.cJeremy Fitzhardinge2009-02-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compile problem: CC arch/x86/kernel/early_printk.o In file included from /home/jeremy/hg/xen/paravirt/linux/arch/x86/kernel/early_printk.c:17: /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pmd_page': /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function '__pfn_to_section' /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: warning: initialization makes pointer from integer without a cast /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function '__section_mem_map_addr' /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:516: warning: return makes pointer from integer without a cast /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pud_page': /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:586: warning: initialization makes pointer from integer without a cast /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:586: warning: return makes pointer from integer without a cast /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h: In function 'pgd_page': /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:625: warning: initialization makes pointer from integer without a cast /home/jeremy/hg/xen/paravirt/linux/arch/x86/include/asm/pgtable.h:625: warning: return makes pointer from integer without a cast This is a cycling dependency between asm/pgtable.h and linux/mmzone.h when using CONFIG_SPARSEMEM. Rather than hacking up the headers some more, remove asm/pgtable.h, since early_printk.c doesn't actually need it. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: asm/io.h: unify ioremap prototypesJeremy Fitzhardinge2009-02-063-51/+31
| | | | | | | | | | | | | | | | | | Impact: unify identical code asm/io_32.h and _64.h have identical prototypes for the ioremap family of functions. The 32-bit header had a more descriptive comment. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: asm/io.h: unify virt_to_phys/phys_to_virtJeremy Fitzhardinge2009-02-063-94/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | Impact: unify identical code asm/io_32.h and _64.h has functionally identical definitions for virt_to_phys, phys_to_virt, page_to_phys, and the isa_* variants, so just unify them. The only slightly functional change is using phys_addr_t for the physical address argument and return val. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: make pgd/pud/pmd/pte_none consistentJeremy Fitzhardinge2009-02-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The _none test is done differently for every level of the pagetable. Standardize them by: 1: Use the native_X_val to extract the raw entry, with no need to go via paravirt_ops, diff -r 1d0646d0d319 arch/x86/include/asm/pgtable.h, and 2: Compare with 0 rather than using a boolean !, since they are actually values and not booleans. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: add and use pgd/pud/pmd_flagsJeremy Fitzhardinge2009-02-062-8/+23
| | | | | | | | | | | | | | | | Add pgd/pud/pmd_flags which are analogous to pte_flags, and use them where-ever we only care about testing the flags portions of the respective entries. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify io_remap_pfn_rangeJeremy Fitzhardinge2009-02-063-6/+3
| | | | | | | | | | | | | | | | Impact: cleanup Unify io_remap_pfn_range. Don't demacro yet. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_noneJeremy Fitzhardinge2009-02-062-2/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_noneJeremy Fitzhardinge2009-02-063-6/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pages_to_mbJeremy Fitzhardinge2009-02-063-4/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pages_to_mb. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_badJeremy Fitzhardinge2009-02-063-7/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_bad. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_badJeremy Fitzhardinge2009-02-063-10/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_bad. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_badJeremy Fitzhardinge2009-02-062-5/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_bad. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_largeJeremy Fitzhardinge2009-02-063-8/+6
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_large. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pte_offset_kernelJeremy Fitzhardinge2009-02-063-6/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pte_offset_kernel. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pte_indexJeremy Fitzhardinge2009-02-063-9/+11
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pte_index. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_pfnJeremy Fitzhardinge2009-02-063-10/+9
| | | | | | | | | | | | | | | | | | Impact: cleanup Unify pmd_pfn. Unfortunately it can't be demacroed because it has a cyclic dependency on linux/mm.h:page_to_nid(). Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_pfnJeremy Fitzhardinge2009-02-062-2/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_pfn. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: remove redundant pfn_pmd definitionJeremy Fitzhardinge2009-02-061-1/+0
| | | | | | | | | | | | | | | | Impact: cleanup It's already defined in pgtable.h Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_offsetJeremy Fitzhardinge2009-02-063-6/+6
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_offset. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_indexJeremy Fitzhardinge2009-02-063-10/+11
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_index. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_pageJeremy Fitzhardinge2009-02-063-4/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_page. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_page_vaddrJeremy Fitzhardinge2009-02-063-4/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_page_vaddr. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_offsetJeremy Fitzhardinge2009-02-062-2/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_offset. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_indexJeremy Fitzhardinge2009-02-062-2/+6
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_index. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_pageJeremy Fitzhardinge2009-02-062-1/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_page. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_pageJeremy Fitzhardinge2009-02-063-3/+6
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_page. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: include pgtable_SIZE.h earlierJeremy Fitzhardinge2009-02-061-6/+10
| | | | | | | | | | | | We'll need the definitions sooner. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_page_vaddrJeremy Fitzhardinge2009-02-063-5/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_page_vaddr. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_page_vaddrJeremy Fitzhardinge2009-02-062-2/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_page_vaddr. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_noneJeremy Fitzhardinge2009-02-063-3/+7
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pmd_presentJeremy Fitzhardinge2009-02-063-2/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pmd_present. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pgd_presentJeremy Fitzhardinge2009-02-062-1/+7
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pgd_present. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pud_presentJeremy Fitzhardinge2009-02-063-6/+7
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pud_present. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pte_presentJeremy Fitzhardinge2009-02-063-4/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pte_present. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pte_sameJeremy Fitzhardinge2009-02-063-8/+6
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pte_same. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
| * x86: unify pte_noneJeremy Fitzhardinge2009-02-064-8/+5
| | | | | | | | | | | | | | | | Impact: cleanup Unify and demacro pte_none. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
* | mm: fix error case in mlock downgrade reversionHugh Dickins2009-02-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 27421e211a39784694b597dbf35848b88363c248, Manually revert "mlock: downgrade mmap sem while populating mlocked regions", has introduced its own regression: __mlock_vma_pages_range() may report an error (for example, -EFAULT from trying to lock down pages from beyond EOF), but mlock_vma_pages_range() must hide that from its callers as before. Reported-by: Sami Farin <safari-kernel@safari.iki.fi> Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Linux 2.6.29-rc4v2.6.29-rc4Linus Torvalds2009-02-081-1/+1
| |
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-updateLinus Torvalds2009-02-083-18/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-update: async: use list_move_tail async: Rename _special -> _domain for clarity. async: Add some documentation. async: Handle kthread_run() return codes. async: Fix running list handling.
| * | async: use list_move_tailStefan Richter2009-02-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | list.h provides a dedicated primitive for "list_del followed by list_add_tail"... list_move_tail. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| * | async: Rename _special -> _domain for clarity.Cornelia Huck2009-02-083-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the async_*_special() functions to async_*_domain(), which describes the purpose of these functions much better. [Broke up long lines to silence checkpatch] Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
| * | async: Add some documentation.Cornelia Huck2009-02-081-0/+47
| | | | | | | | | | | | | | | | | | | | | Add some kerneldoc to the async interface. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
| * | async: Handle kthread_run() return codes.Cornelia Huck2009-02-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we fail to create the manager thread, fall back to non-fastboot. If we fail to create an async thread, try again after waiting for a bit. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
| * | async: Fix running list handling.Cornelia Huck2009-02-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | async_schedule() should pass in async_running as the running list, and run_one_entry() should put the entry to be run on the provided running list instead of always on the generic one. Reported-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
* | | radeonfb: Fix resume from D3Cold on some platformsBenjamin Herrenschmidt2009-02-082-67/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For historical reason, this driver used its own saving/restoring of the PCI config space, and used the state of it on resume as an indication as to whether it needed to re-POST the chip or not. This methods breaks with the later core changes since the core will have restored things for us. This patch fixes it by removing that custom code, using standard core methods to save/restore state, and testing for the need to re-POST by comparing the content of a few key PLL registers. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | aty128fb: Properly save PCI state before changing PCI PM levelBenjamin Herrenschmidt2009-02-081-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes aty128fb to properly save the PCI config space -before- it potentially switches the PM state of the chip. This avoids a warning with the new PM core and is the right thing to do anyway. I also replaced the hand-coded switch to D2 with a call to the genericc pci_set_power_state() and removed the code that switches it back to D0 since the generic code is doing that for us nowadays. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | atyfb: Properly save PCI state before changing PCI PM levelBenjamin Herrenschmidt2009-02-081-5/+15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes atyfb to properly save the PCI config space -before- it potentially switches the PM state of the chip. This avoids a warning with the new PM core and is the right thing to do anyway. I also slightly cleaned up the code that checks whether we are running on a PowerMac to do a runtime check instead of a compile check only, and replaced a deprecated number with the proper symbolic constant. Finally, I removed the useless switch to D0 from resume since the core does it for us. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2009-02-0710-87/+132
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI PM: make the PM core more careful with drivers using the new PM framework PCI PM: Read power state from device after trying to change it on resume PCI PM: Do not disable and enable bridges during suspend-resume PCI: PCIe portdrv: Simplify suspend and resume PCI PM: Fix saving of device state in pci_legacy_suspend PCI PM: Check if the state has been saved before trying to restore it PCI PM: Fix handling of devices without drivers PCI: return error on failure to read PCI ROMs PCI: properly clean up ASPM link state on device remove
generated by cgit (git 2.34.1) at 2024-09-21 23:32:23 +0000