This goal definition is superflous.
CONFIG_X86_64_SMP depends on CONFIG_SMP
and tsc_sync.o is already in the definition of CONFIG_SMP.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/kernel/Makefile | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 4ad4509..6b61081 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -69,7 +69,6 @@ obj-$(CONFIG_APM) += apm.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_SMP) += smpboot.o tsc_sync.o
obj-$(CONFIG_SMP) += setup_percpu.o
-obj-$(CONFIG_X86_64_SMP) += tsc_sync.o
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
obj-y += apic/
obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
--
1.7.2.3
apic_force_enable(), apic_verify() and the variable
force_enable_local_apic are only used by init code
and now get marked as such.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/kernel/apic/apic.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 6c464a3..b62723c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -93,7 +93,7 @@ DEFINE_EARLY_PER_CPU(int, x86_cpu_to_logical_apicid, BAD_APICID);
*
* +1=force-enable
*/
-static int force_enable_local_apic;
+static int force_enable_local_apic __initdata;
/*
* APIC command line parameters
*/
@@ -1560,7 +1560,7 @@ static int __init detect_init_APIC(void)
}
#else
-static int apic_verify(void)
+static int __init apic_verify(void)
{
u32 features, h, l;
@@ -1585,7 +1585,7 @@ static int apic_verify(void)
return 0;
}
-int apic_force_enable(unsigned long addr)
+int __init apic_force_enable(unsigned long addr)
{
u32 h, l;
--
1.7.2.3
lapic_clockevent is moved, that we can get rid of some
unneeded prototypes.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/kernel/apic/apic.c | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 161342a..35d7fa2 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -187,29 +187,8 @@ static struct resource lapic_resource = {
static unsigned int calibration_result;
-static int lapic_next_event(unsigned long delta,
- struct clock_event_device *evt);
-static void lapic_timer_setup(enum clock_event_mode mode,
- struct clock_event_device *evt);
-static void lapic_timer_broadcast(const struct cpumask *mask);
static void apic_pm_activate(void);
-/*
- * The local apic timer can be used for any function which is CPU local.
- */
-static struct clock_event_device lapic_clockevent = {
- .name = "lapic",
- .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT
- | CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,
- .shift = 32,
- .set_mode = lapic_timer_setup,
- .set_next_event = lapic_next_event,
- .broadcast = lapic_timer_broadcast,
- .rating = 100,
- .irq = -1,
-};
-static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
-
static unsigned long apic_phys;
/*
@@ -501,6 +480,23 @@ static void lapic_timer_broadcast(const struct cpumask *mask)
#endif
}
+
+/*
+ * The local apic timer can be used for any function which is CPU local.
+ */
+static struct clock_event_device lapic_clockevent = {
+ .name = "lapic",
+ .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT
+ | CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,
+ .shift = 32,
+ .set_mode = lapic_timer_setup,
+ .set_next_event = lapic_next_event,
+ .broadcast = lapic_timer_broadcast,
+ .rating = 100,
+ .irq = -1,
+};
+static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
+
/*
* Setup the local APIC timer for this CPU. Copy the initialized values
* of the boot CPU and register the clock event in the framework.
--
1.7.2.3
This variable placed better into section .init.data,
since its only accessed by __init code.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/kernel/apic/apic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 35d7fa2..966673f 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -163,7 +163,7 @@ early_param("nox2apic", setup_nox2apic);
unsigned long mp_lapic_addr;
int disable_apic;
/* Disable local APIC timer from the kernel commandline or via dmi quirk */
-static int disable_apic_timer __cpuinitdata;
+static int disable_apic_timer __initdata;
/* Local APIC timer works in C2 */
int local_apic_timer_c2_ok;
EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
--
1.7.2.3
This function is not used anywhere in the tree,
since commit 072b198a4ad48bd722ec6d203d65422a4698eae7
so it can be removed.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/include/asm/apic.h | 1 -
arch/x86/kernel/apic/apic.c | 17 -----------------
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index b3f444d..72bdfec 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -238,7 +238,6 @@ void register_lapic_address(unsigned long address);
extern void setup_boot_APIC_clock(void);
extern void setup_secondary_APIC_clock(void);
extern int APIC_init_uniprocessor(void);
-extern void enable_NMI_through_LVT0(void);
extern int apic_force_enable(unsigned long addr);
/*
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 4a65366..161342a 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -292,23 +292,6 @@ u64 native_apic_icr_read(void)
return icr1 | ((u64)icr2 << 32);
}
-/**
- * enable_NMI_through_LVT0 - enable NMI through local vector table 0
- */
-void __cpuinit enable_NMI_through_LVT0(void)
-{
- unsigned int v;
-
- /* unmask and set to NMI */
- v = APIC_DM_NMI;
-
- /* Level triggered for 82489DX (32bit mode) */
- if (!lapic_is_integrated())
- v |= APIC_LVT_LEVEL_TRIGGER;
-
- apic_write(APIC_LVT0, v);
-}
-
#ifdef CONFIG_X86_32
/**
* get_physical_broadcast - Get number of physical broadcast IDs
--
1.7.2.3
The function cache_APIC_registers() does not exist in
the whole git history, so it can be removed.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/include/asm/apic.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 72bdfec..a279d98 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -227,7 +227,6 @@ extern void disconnect_bsp_APIC(int virt_wire_setup);
extern void disable_local_APIC(void);
extern void lapic_shutdown(void);
extern int verify_local_APIC(void);
-extern void cache_APIC_registers(void);
extern void sync_Arb_IDs(void);
extern void init_bsp_APIC(void);
extern void setup_local_APIC(void);
--
1.7.2.3
apic_disable() is only used in apic.c, so it does not
need the prototype which was introduced in
commit 08306ce61d6848e6fbf74fa4cc693c3fb29e943f .
Therefore we remove it from the header and make it static.
It is also called only from init code, so we mark it as such.
Signed-off-by: Henrik Kretzschmar <[email protected]>
---
arch/x86/include/asm/apic.h | 2 --
arch/x86/kernel/apic/apic.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index dbd558c..b3f444d 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -220,7 +220,6 @@ extern void enable_IR_x2apic(void);
extern int get_physical_broadcast(void);
-extern void apic_disable(void);
extern int lapic_get_maxlvt(void);
extern void clear_local_APIC(void);
extern void connect_bsp_APIC(void);
@@ -261,7 +260,6 @@ static inline void lapic_shutdown(void) { }
#define local_apic_timer_c2_ok 1
static inline void init_apic_mappings(void) { }
static inline void disable_local_APIC(void) { }
-static inline void apic_disable(void) { }
# define setup_boot_APIC_clock x86_init_noop
# define setup_secondary_APIC_clock x86_init_noop
#endif /* !CONFIG_X86_LOCAL_APIC */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index b62723c..4a65366 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -248,7 +248,7 @@ static int modern_apic(void)
* right after this call apic become NOOP driven
* so apic->write/read doesn't do anything
*/
-void apic_disable(void)
+static void __init apic_disable(void)
{
pr_info("APIC: switched to apic NOOP\n");
apic = &apic_noop;
--
1.7.2.3
* Henrik Kretzschmar <[email protected]> wrote:
> This goal definition is superflous.
> CONFIG_X86_64_SMP depends on CONFIG_SMP
> and tsc_sync.o is already in the definition of CONFIG_SMP.
>
> Signed-off-by: Henrik Kretzschmar <[email protected]>
Please pick up the Acked-by's you got for the patches from Cyrill and repost the
series once all patches are acked.
Thanks,
Ingo
On Fri, Mar 4, 2011 at 2:58 PM, Henrik Kretzschmar
<[email protected]> wrote:
> This goal definition is superflous.
> CONFIG_X86_64_SMP depends on CONFIG_SMP
> and tsc_sync.o is already in the definition of CONFIG_SMP.
>
> Signed-off-by: Henrik Kretzschmar <[email protected]>
> ---
> ?arch/x86/kernel/Makefile | ? ?1 -
> ?1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
> index 4ad4509..6b61081 100644
> --- a/arch/x86/kernel/Makefile
> +++ b/arch/x86/kernel/Makefile
> @@ -69,7 +69,6 @@ obj-$(CONFIG_APM) ? ? ? ? ? ? += apm.o
> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smp.o
> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smpboot.o tsc_sync.o
> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= setup_percpu.o
> -obj-$(CONFIG_X86_64_SMP) ? ? ? += tsc_sync.o
> ?obj-$(CONFIG_X86_MPPARSE) ? ? ?+= mpparse.o
> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= apic/
> ?obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
> --
> 1.7.2.3
>
>
Probably we better write it this way:
- obj-$(CONFIG_SMP) += smpboot.o tsc_sync.o
- obj-$(CONFIG_X86_64_SMP) += tsc_sync.o
+ obj-$(CONFIG_SMP) += smpboot.o
+ obj-$(CONFIG_SMP) += tsc_sync.o
I guess this would be cleaner? Ingo?
On Fri, Mar 4, 2011 at 3:43 PM, Cyrill Gorcunov <[email protected]> wrote:
> On Fri, Mar 4, 2011 at 2:58 PM, Henrik Kretzschmar
> <[email protected]> wrote:
>> This goal definition is superflous.
>> CONFIG_X86_64_SMP depends on CONFIG_SMP
>> and tsc_sync.o is already in the definition of CONFIG_SMP.
>>
>> Signed-off-by: Henrik Kretzschmar <[email protected]>
>> ---
>> ?arch/x86/kernel/Makefile | ? ?1 -
>> ?1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
>> index 4ad4509..6b61081 100644
>> --- a/arch/x86/kernel/Makefile
>> +++ b/arch/x86/kernel/Makefile
>> @@ -69,7 +69,6 @@ obj-$(CONFIG_APM) ? ? ? ? ? ? += apm.o
>> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smp.o
>> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smpboot.o tsc_sync.o
>> ?obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= setup_percpu.o
>> -obj-$(CONFIG_X86_64_SMP) ? ? ? += tsc_sync.o
>> ?obj-$(CONFIG_X86_MPPARSE) ? ? ?+= mpparse.o
>> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ?+= apic/
>> ?obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o
>> --
>> 1.7.2.3
>>
>>
>
> Probably we better write it this way:
>
> - obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smpboot.o tsc_sync.o
> - obj-$(CONFIG_X86_64_SMP) ? ? ? += tsc_sync.o
>
> + obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= smpboot.o
> + obj-$(CONFIG_SMP) ? ? ? ? ? ? ?+= tsc_sync.o
>
> I guess this would be cleaner? Ingo?
>
Others patches in series looks good to me, feel free to add
Acked-by: Cyrill Gorcunov <[email protected]>
when needed. Thanks a lot!
Am 04.03.2011 13:50, schrieb Cyrill Gorcunov:
>> Probably we better write it this way:
>>
>> - obj-$(CONFIG_SMP) += smpboot.o tsc_sync.o
>> - obj-$(CONFIG_X86_64_SMP) += tsc_sync.o
>>
>> + obj-$(CONFIG_SMP) += smpboot.o
>> + obj-$(CONFIG_SMP) += tsc_sync.o
>>
Yes, I see what you mean. Removing/adding one item on such a multiple item
line makes muddled diffs.
Thank you for friendly reviewing, patience and your Acked-by,
Henrik Kretzschmar