summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* x86: fix apic version warningYinghai Lu2008-08-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | after following patch, commit 1b313f4a6d7bee7b2c034b3f1e203bc360a71cca Author: Cyrill Gorcunov <gorcunov@gmail.com> Date: Mon Aug 18 20:45:57 2008 +0400 x86: apic - generic_processor_info - use physid_set instead of phys_cpu and physids_or - set phys_cpu_present_map bit AFTER check for allowed number of processors - add checking for APIC valid version in 64bit mode (mostly not needed but added for merging purpose) - add apic_version definition for 64bit mode which is used now we are getting warning for acpi path on 64 bit system. make the 64-bit side fill in apic_version[] as well. [ mingo@elte.hu: build fix ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - compilation warnings fixCyrill Gorcunov2008-08-192-12/+18
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - lapic_resume 32bit - unification fixCyrill Gorcunov2008-08-191-0/+2
| | | | | | | | Just add parenthesis to be identical of current 64bit implementation (so diff will not complain). Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - rearrange parse_lapic_timer_c2_okCyrill Gorcunov2008-08-191-7/+7
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify disableapic and nolapic setup handlersCyrill Gorcunov2008-08-192-5/+12
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify apic_set_verbosityCyrill Gorcunov2008-08-192-24/+39
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify local_apic_timer_interruptCyrill Gorcunov2008-08-192-0/+8
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify end_local_APIC_setupCyrill Gorcunov2008-08-192-2/+13
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - generic_processor_infoCyrill Gorcunov2008-08-192-9/+47
| | | | | | | | | | | | | - use physid_set instead of phys_cpu and physids_or - set phys_cpu_present_map bit AFTER check for allowed number of processors - add checking for APIC valid version in 64bit mode (mostly not needed but added for merging purpose) - add apic_version definition for 64bit mode which is used now Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify disconnect_bsp_APICCyrill Gorcunov2008-08-192-34/+55
| | | | | | | - just #ifdef added Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify __setup_APIC_LVTTCyrill Gorcunov2008-08-192-7/+15
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_setup_esrCyrill Gorcunov2008-08-192-22/+50
| | | | | | | | | We use 32bit code former for 64bit mode since it's much better implementation and easier to merge. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify connect_bsp_APICCyrill Gorcunov2008-08-192-2/+20
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_shutdownCyrill Gorcunov2008-08-192-4/+19
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify disable_local_APICCyrill Gorcunov2008-08-192-1/+17
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify setup_boot_APIC_clockCyrill Gorcunov2008-08-191-0/+1
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - rearrange maxcpu definitionCyrill Gorcunov2008-08-192-3/+3
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_resume - fixYinghai Lu2008-08-181-0/+2
| | | | | Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify xapic_icr_readCyrill Gorcunov2008-08-171-1/+1
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_is_integratedCyrill Gorcunov2008-08-172-1/+9
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - rearrange functions and commentsCyrill Gorcunov2008-08-172-40/+77
| | | | | | | | | | | Rearrange functions and comments to find differences easier. Also use apic_printk in setup_boot_APIC_clock for 64bit mode. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_suspendCyrill Gorcunov2008-08-172-2/+3
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify lapic_resumeCyrill Gorcunov2008-08-172-15/+33
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify clear_local_APICCyrill Gorcunov2008-08-172-7/+16
| | | | | | | | | | | | | | | - Remove redundant masking of APIC_LVTTHMR register in apic_32.c - Add masking of APIC_LVTTHMR register to apic_64.c. We use a bit complicated #ifdef here: CONFIG_X86_MCE_P4THERMAL is 32bit specific and X86_MCE_INTEL is 64bit specific so the appropriate config variable will be set by Kconfig. - the APIC_ESR register clearing in apic_64.c now uses not straightforward way but this is allowed tradeoff. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify init_bsp_APICCyrill Gorcunov2008-08-162-4/+14
| | | | | | | | | | - remove redundant read of APIC_LVR register in 64bit mode - APIC is always integrated for 64bit mode so gcc will eliminate lapic_is_integrated call Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - sync_Arb_IDs style fixupCyrill Gorcunov2008-08-162-2/+5
| | | | | | | | No changes on binary level Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify sync_Arb_IDsCyrill Gorcunov2008-08-152-6/+7
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify verify_local_APICCyrill Gorcunov2008-08-151-0/+6
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - get rid of local_apic_timer_verify_okCyrill Gorcunov2008-08-151-6/+4
| | | | | | | | | We are able to use clock_event_device as it's done in 64bit apic code so lets get rid of local_apic_timer_verify_ok variable. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - do not clear APIC twice in lapic_shutdownCyrill Gorcunov2008-08-151-1/+2
| | | | | | | | There is no need to clear APIC twice since disable_local_APIC will clear it anyway. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify __setup_APIC_LVTTCyrill Gorcunov2008-08-151-2/+8
| | | | | | | | | | | | | | To be able to unify this function we RE-introduce APIC_DIVISOR for 64bit mode. This snipped was eliminated in some time ago in a sake of clenup but now we need it again since it allow up to get rid of #ifdef(s). And lapic_is_integrated call is added in apic_64.c but since we always have APIC integrated on 64bit cpu compiler will ignore this call. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - unify disable_apic_timerCyrill Gorcunov2008-08-152-10/+23
| | | | | | | Get rid of local_apic_timer_disabled and use disable_apic_timer instead. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86: apic - use SET_APIC_DEST_FIELD instead of hardcoded shiftCyrill Gorcunov2008-08-151-1/+1
| | | | | Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* x86_64: uml: fix rename header guardHiroshi Shimamoto2008-08-151-2/+2
| | | | | | | | | | In unistd_64.h, the guard macro _ASM_X86_64_UNISTD_H_ is renamed to ASM_X86__UNISTD_64_H. This change should be applied to arch/um/sys-x86_64/syscall_table.c. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* Merge branch 'x86/apic' into x86/coreIngo Molnar2008-08-145-34/+61
|\
| * x86: apic unification - merge down enable_NMI_through_LVT0Cyrill Gorcunov2008-07-242-2/+11
| | | | | | | | | | | | | | | | No code change on binary level. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * x86: apic unification - merge down lapic_get_maxlvtCyrill Gorcunov2008-07-242-5/+12
| | | | | | | | | | | | | | | | No code change on binary level. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Cc: macro@linux-mips.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * x86: PIC, L-APIC and I/O APIC debug informationMaciej W. Rozycki2008-07-243-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump all the PIC, local APIC and I/O APIC information at the fs_initcall() level, which is after ACPI (if used) has initialised PCI information, making the point of invocation consistent across MP-table and ACPI platforms. Remove explicit calls to print_IO_APIC() from elsewhere. Make the interface of all the functions involved consistent between 32-bit and 64-bit versions and make them all static by default by the means of a New-and-Improved(TM) __apicdebuginit() macro. Note that like print_IO_APIC() all these only output anything if "apic=debug" has been passed to the kernel through the command line. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| |
| \
| \
| \
*---. \ Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/coreIngo Molnar2008-08-1423-17/+41
|\ \ \ \
| | | * | x86: print per_cpu data addressYinghai Lu2008-07-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make sure per_cpu data on correct node. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | | * | x86, 64-bit, dwarf2: push pushes 8 bytes and popf pops 8Alexander van Heukelum2008-07-241-2/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CFI_ADJUST_CFA_OFFSET dwarf2 annotation of a push/popf pair in ret_from_fork wrongly used a value of 4. It should have been 8. Fix that. Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm> Cc: Andi Kleen <andi@firstfloor.org> Cc: heukelum@fastmail.fm Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | Merge branch 'linus' into x86/x2apicIngo Molnar2008-08-113615-19574/+263844
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/x86/kernel/genapic_64.c Manual merge: arch/x86/kernel/genx2apic_uv_x.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
| | * | | x86_32: use apic_ops at print_local_APIC()Hiroshi Shimamoto2008-07-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use apic_icr_read at print_local_APIC() in io_apic_32.c Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com>
| * | | | Merge commit 'v2.6.27-rc3' into x86/prototypesIngo Molnar2008-08-143939-34104/+284319
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/asm-x86/dma-mapping.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
| * | | | | X86_SMP: ipi.c declare functions before they get usedJaswinder Singh2008-07-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move <mach_ipi.h> upwards for __send_IPI_shortcut and send_IPI_mask_bitmask Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| * | | | | X86_SMP: smpboot.c declare idle_thread_array and smp_b_stepping as staticJaswinder Singh2008-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| * | | | | X86_32: declare pt_regs_access as unsigned longJaswinder Singh2008-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed pt_regs_access to unsigned long as per X86_64 Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| * | | | | x86: mach-default/setup.c declare no_broadcast before they get usedJaswinder Singh2008-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | included mach_ipi.h for no_broadcast declaration fixed minor spacing for no_broadcast Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| * | | | | x86: mm/ioremap.c declare early_ioremap_debug and early_ioremap_nested as staticJaswinder Singh2008-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
| * | | | | x86: mm/fault.c declare do_page_fault before they get usedJaswinder Singh2008-07-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declared do_page_fault() in asm-x86/trap.h for both X86_32 and X86_64 removed do_invalid_op declaration from mm/fault.c as it is already declared in asm-x86/trap.h Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
OpenPOWER on IntegriCloud