10 Feb, 2008
40 commits
-
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Beginning from commit 4138cc3418f5, ioremap_nocache() sets the _PAGE_PWT
flag.Lguest doesn't accept a guest pte with a _PWT flag and reports a "bad
page table entry" in that case.Accept guest _PAGE_PWT page table entries.
Signed-off-by: Ahmed S. Darwish
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
In some suspend and hibernation files in arch/x86/power there are
comments referring to arch/x86-64 and arch/i386 . Update them to
reflect the current code layout.Signed-off-by: Rafael J. Wysocki
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Move the hibernation-specific code from arch/x86/power/suspend_64.c
to a separate file (hibernate_64.c) and the CPU-handling code to
cpu_64.c (in line with the corresponding 32-bit code).Simplify arch/x86/power/Makefile .
Signed-off-by: Rafael J. Wysocki
Acked-by: Pavel Machek
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Rename cpu.c, suspend.c and swsusp.S in arch/x86/power to cpu_32.c,
hibernate_32.c and hibernate_asm_32.S, respectively, and update the
purpose and copyright information in these files.Update the Makefile in arch/x86/power to reflect the above changes.
Signed-off-by: Rafael J. Wysocki
Acked-by: Pavel Machek
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Move arch/x86/kernel/suspend_64.c to arch/x86/power .
Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power
as hibernate_asm_64.S .Update purpose and copyright information in
arch/x86/power/suspend_64.c and
arch/x86/power/hibernate_asm_64.S .Update the Makefiles in arch/x86, arch/x86/kernel and
arch/x86/power to reflect the above changes.Signed-off-by: Rafael J. Wysocki
Acked-by: Pavel Machek
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
In arch/x86/boot/printf.c gets rid of unused tail of digits: const char
*digits = "0123456789abcdefghijklmnopqrstuvwxyz"; (we are using 0-9a-f
only)Uses smaller/faster lowercasing (by ORing with 0x20)
if we know that we work on numbers/digits. Makes
strtoul smaller, and also we are getting rid ofstatic const char small_digits[] = "0123456789abcdefx";
static const char large_digits[] = "0123456789ABCDEFX";since this works equally well:
static const char digits[16] = "0123456789ABCDEF";
Size savings:
$ size vmlinux.org vmlinux
text data bss dec hex filename
877320 112252 90112 1079684 107984 vmlinux.org
877048 112252 90112 1079412 107874 vmlinuxIt may be also a tiny bit faster because code has less
branches now, but I doubt it is measurable.[ hugh@veritas.com: uppercase pointers fix ]
Signed-off-by: Denys Vlasenko
Cc: Andi Kleen
Signed-off-by: Andrew Morton
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Some important parts of f6df72e71eba621b2f5c49b3a763116fac748f6e got
dropped along the way, reintroduce them.Only affects paravirt guests.
Signed-off-by: Ian Campbell
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Specifically the boot time page tables in a CONFIG_X86_PAE=y enabled
kernel are in PAE format.early_ioremap is updated to use the standard page table accessors.
Clear any mappings beyond max_low_pfn from the boot page tables in
native_pagetable_setup_start because the initial mappings can extend
beyond the range of physical memory and into the vmalloc area.Derived from patches by Eric Biederman and H. Peter Anvin.
[ jeremy@goop.org: PAE swapper_pg_dir needs to be page-sized fix ]
Signed-off-by: Ian Campbell
Cc: H. Peter Anvin
Cc: Eric W. Biederman
Cc: Andi Kleen
Cc: Mika Penttilä
Cc: Jeremy Fitzhardinge
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Other than the defconfigs, remove the entry in compiler-gcc4.h,
Kconfig.debug and feature-removal-schedule.txt.Signed-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Signed-off-by: Thomas Gleixner
Signed-off-by: Ingo Molnar -
Use a common irq_return entry point for all the iret places, which
need the paravirt INTERRUPT return wrapper.Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Document randomize_va_space and CONFIG_COMPAT_BRK.
Signed-off-by: Jiri Kosina
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Add function definition and extern variables to asm-x86/acpi.h.
All of these are used in bus.c in ifdef(CONFIG_X86) sections, so are
only added to the x86 include headers. boot.c already includes acpi.h
so no changes are needed there.Fixes the following:
arch/x86/kernel/acpi/boot.c:83:4: warning: symbol 'acpi_sci_flags' was not declared. Should it be static?
arch/x86/kernel/acpi/boot.c:84:5: warning: symbol 'acpi_sci_override_gsi' was not declared. Should it be static?
arch/x86/kernel/acpi/boot.c:421:13: warning: symbol 'acpi_pic_sci_set_trigger' was not declared. Should it be static?Signed-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
arch/x86/kernel/topology.c:56:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Adjust the definition of lookup_address to take an unsigned long
level argument. Adjust callers in xen/mmu.c that pass in a
dummy variable.Signed-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
arch/x86/kernel/cpu/mcheck/therm_throt.c:121:2: warning: returning void-valued expression
Signed-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Use xen_khz to denote xen_specific clock speed. Avoid shadowing
cpu_khz.arch/x86/xen/time.c:220:6: warning: symbol 'cpu_khz' shadows an earlier one
include/asm/tsc.h:17:21: originally declared hereSigned-off-by: Harvey Harrison
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Signed-off-by: Arnd Hannemann
Signed-off-by: Andres Salomon
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Each AMD Geode MFGPT timer interrupt output is paired with another
timer; esentially the interrupt goes if either timer fires. This
is okay, but the handlers need to be aware of this. Make sure in
the timer tick handler that our timer really did expire.Signed-off-by: Jordan Crouse
Signed-off-by: Andres Salomon
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
We *really* don't want to be reading MFGPTx_SETUP and writing back those
values. What we want to be doing is clearing CMP1 and CMP2 unconditionally;
otherwise, we have races where CMP1 and/or CMP2 fire after we've read
MFGPTx_SETUP. They can also fire between when we've written ~CNTEN to
the register, and when the new register values get copied to the timer's
version of the register. By clearing both fields, we're okay.Signed-off-by: Andres Salomon
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
There isn't much value to always detecting the MFGPT timers on
Geode platforms; detection is only needed when something wants
to use the timers. Move the detection code so that it gets
called the first time a timer is allocated.Signed-off-by: Jordan Crouse
Signed-off-by: Andres Salomon
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
We need to be called from elsewhere, and this gets some #ifdefs out
of the .c file.Signed-off-by: Andres Salomon
Signed-off-by: Jordan Crouse
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
Drop F_AVAIL and the 'flags' field, replacing with an 'avail' bit. This
looks more understandable to me.Signed-off-by: Andres Salomon
Signed-off-by: Jordan Crouse
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
We had planned to use the 'owner' field for allowing re-allocation of
MFGPTs; however, doing it by module owner name isn't flexible enough. So,
drop this for now. If it turns out that we need timers in modules, we'll
need to come up with a scheme that matches the write-once fields of the
MFGPTx_SETUP register, and drops ponies from the sky.Signed-off-by: Andres Salomon
Signed-off-by: Jordan Crouse
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
The GEODE MFGPT code assumed that 32kHz was 32000 Hz while the boards
run on a 32.768 kHz digital watch crystal. In practise, it will not
change the timer's frequency as the skew was only 2.4%, but it
should provide more accurate intervals.Signed-off-by: Willy Tarreau
Signed-off-by: Andres Salomon
Signed-off-by: Jordan Crouse
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
- uninline timer functions; the compiler knows better than we do
whether or not to inline these.
- mfgpt_start_timer() had an unused 'clock' argument, drop it.From both Jordan and myself.
Signed-off-by: Jordan Crouse
Signed-off-by: Andres Salomon
Signed-off-by: Ingo Molnar
Signed-off-by: Thomas Gleixner -
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] dynamic page tables.
[S390] Add four level page tables for CONFIG_64BIT=y.
[S390] 1K/2K page table pages.
[S390] Remove a.out header file.
[S390] sclp_vt220: Fix vt220 initialization
[S390] qdio: avoid hang when establishing qdio queues
[S390] VMEM_MAX_PHYS overflow on 31 bit.
[S390] zcrypt: Do not start ap poll thread per default
[S390] Fix __ffs_word_loop/__ffz_word_loop inlnie assembly.
[S390] Wire up new timerfd syscalls.
[S390] Update default configuration. -
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
Kbuild: Fix deb-pkg target to work with kernel versions ending with -
ide: introduce HAVE_IDE
kbuild: silence CHK/UPD messages according to $(quiet)
scsi: fix makefile for aic7(3*x)
kbuild/modpost: Use warn() for announcing section mismatches
Add binoffset to gitignore
kbuild/modpost: improve warnings if symbol is unknown -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
Merge branches 'release' and 'buildfix' into release
acer-wmi - Add documentation
sonypi - Move sonypi.txt to Documentation/laptops
sony-laptop - Move sony-laptop.txt to Documentation/laptops
thinkpad-acpi - Move thinkpad-acpi.txt to Documentation/laptops
Documentation - Create laptops sub-directory
ACPI: thermal: buildfix for CONFIG_THERMAL=n
cpuidle: build fix for non-x86
acer-wmi: Fix backlight on AMW0 (V1) laptops
tc1100-wmi: Mark as experimental
ACPI: SBS: Host controller must initialize before SBS. -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: extend ricoh_mmc to support Ricoh RL5c476
at91_mci: use generic GPIO calls
sdhci: add num index for multi controllers case
MAINTAINERS: remove non-existant URLs
mmc: remove sdhci and mmc_spi experimental markers
mmc: Handle suspend/resume in Ricoh MMC disabler -
* git://git.infradead.org/mtd-2.6:
[MTD] [NAND] cs553x_nand: command line partitioning support -
Sony MemoryStick cards are used in many products manufactured by Sony.
They are available both as storage and as IO expansion cards. Currently,
only MemoryStick Pro storage cards are supported via TI FlashMedia
MemoryStick interface.[mboton@gmail.com: biuld fix]
[akpm@linux-foundation.org: build fix]
Signed-off-by: Alex Dubov
Signed-off-by: Miguel Boton
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
CC init/main.o
In file included from include2/asm/uaccess.h:8,
from include/linux/poll.h:13,
from include/linux/rtc.h:113,
from include/linux/efi.h:19,
from linux-2.6/init/main.c:43:
include/linux/mm.h:1151:
error: expected declaration specifiers or '...' before 'pgtable_t'Signed-off-by: Martin Schwidefsky
Reported-by: Adrian Bunk
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The pte_fn_t in include/linux/mm.h make it necessary for all architectures
to define a pgtable_t type, even those that do not have an mmu.Signed-off-by: Martin Schwidefsky
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: Pete Zaitcev
Cc: "Oliver Pinter"
Cc: FUJITA Tomonori
Cc: Greg KH
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
- remove non-standard in/out markers
- use tabs for formattingSigned-off-by: Christoph Hellwig
Cc: "Randy.Dunlap"
Cc: Erez Zadok
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
mm_cgroup() is exclusively used to test whether an mm's mem_cgroup pointer
is pointing to a specific cgroup. Instead of returning the pointer, we can
just do the test itself in a new macro:vm_match_cgroup(mm, cgroup)
returns non-zero if the mm's mem_cgroup points to cgroup. Otherwise it
returns zero.Signed-off-by: David Rientjes
Cc: Balbir Singh
Cc: Adrian Bunk
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/hostfs/hostfs_kern.c: In function 'hostfs_show_options':
/home/bunk/linux/kernel-2.6/git/linux-2.6/fs/hostfs/hostfs_kern.c:328: error: dereferencing pointer to incomplete typeWe need to include mount.h to get vfsmount.
Signed-off-by: Jiri Kosina
Reported-by: Adrian Bunk
Cc: Jeff Dike
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
CC mm/vmscan.o
In file included from
/home/bunk/linux/kernel-2.6/git/linux-2.6/mm/vmscan.c:44:
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/swapops.h: In function 'is_swap_pte':
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/swapops.h:48: error: implicit declaration of function 'pte_none'
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/swapops.h:48: error: implicit declaration of function 'pte_present'Does it ever make sense to ask "is this pte a swap entry?" on a machine
with no MMU? Presumably this also means it has no ptes too, right? In
which case, it's better to comment the whole function out. Then when
someone tries to ask the above meaningless question, they get a compile
error rather than a meaningless answer.Signed-off-by: Matt Mackall
Cc: Mike Frysinger
Reported-by: Adrian Bunk
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
