MIPS: Remove last traces of SMTC Support too?

MIPS: Remove last traces of SMTC Support too?

[Paul Bolle]

The patch "MIPS: Remove SMTC Support" landed in linux-next (see
next-20140409). A quick grep of the tree suggests a follow up is needed
(a sort-of-patch is pasted below).

Is a similar follow up queued somewhere? If not, should I submit a patch
or should I wait with doing that until "MIPS: Remove SMTC Support" hits
mainline?


Paul Bolle
---
 arch/mips/configs/maltasmtc_defconfig | 196 --------------------
 arch/mips/include/asm/cpu-info.h      |   2 +-
 arch/mips/include/asm/smtc.h          |  78 --------
 arch/mips/include/asm/smtc_ipi.h      | 129 --------------
 arch/mips/include/asm/smtc_proc.h     |  23 ---
 arch/mips/kernel/cevt-smtc.c          | 324 ----------------------------------
 arch/mips/kernel/smtc-asm.S           | 133 --------------
 arch/mips/kernel/smtc-proc.c          | 102 -----------
 arch/mips/pmcs-msp71xx/msp_smtc.c     | 104 -----------
 9 files changed, 1 insertion(+), 1090 deletions(-)
 delete mode 100644 arch/mips/configs/maltasmtc_defconfig
 delete mode 100644 arch/mips/include/asm/smtc.h
 delete mode 100644 arch/mips/include/asm/smtc_ipi.h
 delete mode 100644 arch/mips/include/asm/smtc_proc.h
 delete mode 100644 arch/mips/kernel/cevt-smtc.c
 delete mode 100644 arch/mips/kernel/smtc-asm.S
 delete mode 100644 arch/mips/kernel/smtc-proc.c
 delete mode 100644 arch/mips/pmcs-msp71xx/msp_smtc.c

diff --git a/arch/mips/configs/maltasmtc_defconfig b/arch/mips/configs/maltasmtc_defconfig
deleted file mode 100644
index eb316447588c..000000000000
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index 2f6812b901b0..04088cf4e519 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -108,7 +108,7 @@ struct proc_cpuinfo_notifier_args {
 	unsigned long n;
 };
 
-#if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)
+#if defined(CONFIG_MIPS_MT_SMP)
 # define cpu_vpe_id(cpuinfo)	((cpuinfo)->vpe_id)
 #else
 # define cpu_vpe_id(cpuinfo)	0
diff --git a/arch/mips/include/asm/smtc.h b/arch/mips/include/asm/smtc.h
deleted file mode 100644
index e56b439b7871..000000000000
diff --git a/arch/mips/include/asm/smtc_ipi.h b/arch/mips/include/asm/smtc_ipi.h
deleted file mode 100644
index 15278dbd7e79..000000000000
diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
deleted file mode 100644
index 25da651f1f5f..000000000000
diff --git a/arch/mips/kernel/cevt-smtc.c b/arch/mips/kernel/cevt-smtc.c
deleted file mode 100644
index b6cf0a60d896..000000000000
diff --git a/arch/mips/kernel/smtc-asm.S b/arch/mips/kernel/smtc-asm.S
deleted file mode 100644
index 2866863a39df..000000000000
diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
deleted file mode 100644
index 38635a996cbf..000000000000
diff --git a/arch/mips/pmcs-msp71xx/msp_smtc.c b/arch/mips/pmcs-msp71xx/msp_smtc.c
deleted file mode 100644
index 6b5607fce279..000000000000
-- 
1.9.0

Re: MIPS: Remove last traces of SMTC Support too?

[Markos Chandras]

On 04/09/2014 09:48 AM, Paul Bolle wrote:
> The patch "MIPS: Remove SMTC Support" landed in linux-next (see
> next-20140409). A quick grep of the tree suggests a follow up is needed
> (a sort-of-patch is pasted below).
>
> Is a similar follow up queued somewhere? If not, should I submit a patch
> or should I wait with doing that until "MIPS: Remove SMTC Support" hits
> mainline?
>
>
> Paul Bolle

Hi Paul,

I talked to Ralf yesterday. It seems the patch was not applied correctly 
and there are a few traces left. My original patch definitely removes 
the traces listed in your patch.

You can compare the original patch

https://patchwork.linux-mips.org/patch/6719/

with the one currently present in upstream-sfr/mips-for-linux-next branch

-- 
markos

Re: MIPS: Remove last traces of SMTC Support too?

[Markos Chandras]

On 04/09/2014 09:48 AM, Paul Bolle wrote:
> The patch "MIPS: Remove SMTC Support" landed in linux-next (see
> next-20140409). A quick grep of the tree suggests a follow up is needed
> (a sort-of-patch is pasted below).
>
> Is a similar follow up queued somewhere? If not, should I submit a patch
> or should I wait with doing that until "MIPS: Remove SMTC Support" hits
> mainline?
>
>
> Paul Bolle

Hi Paul,

I talked to Ralf yesterday. It seems the patch was not applied correctly 
and there are a few traces left. My original patch definitely removes 
the traces listed in your patch.

You can compare the original patch

https://patchwork.linux-mips.org/patch/6719/

with the one currently present in upstream-sfr/mips-for-linux-next branch

-- 
markos

Re: MIPS: Remove last traces of SMTC Support too?

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

On 09/04/14 09:58, Markos Chandras wrote:
> On 04/09/2014 09:48 AM, Paul Bolle wrote:
>> The patch "MIPS: Remove SMTC Support" landed in linux-next (see
>> next-20140409). A quick grep of the tree suggests a follow up is needed
>> (a sort-of-patch is pasted below).
>>
>> Is a similar follow up queued somewhere? If not, should I submit a patch
>> or should I wait with doing that until "MIPS: Remove SMTC Support" hits
>> mainline?
>>
>>
>> Paul Bolle
> 
> Hi Paul,
> 
> I talked to Ralf yesterday. It seems the patch was not applied correctly
> and there are a few traces left. My original patch definitely removes
> the traces listed in your patch.
> 
> You can compare the original patch
> 
> https://patchwork.linux-mips.org/patch/6719/
> 
> with the one currently present in upstream-sfr/mips-for-linux-next branch
> 

Note that the cpu-info.h part of Paul's suggested patch is new, due to
code added in b86c2247a20f (MIPS: Add cpu_vpe_id macro).

Cheers
James


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: MIPS: Remove last traces of SMTC Support too?

[James Hogan]

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

On 09/04/14 09:58, Markos Chandras wrote:
> On 04/09/2014 09:48 AM, Paul Bolle wrote:
>> The patch "MIPS: Remove SMTC Support" landed in linux-next (see
>> next-20140409). A quick grep of the tree suggests a follow up is needed
>> (a sort-of-patch is pasted below).
>>
>> Is a similar follow up queued somewhere? If not, should I submit a patch
>> or should I wait with doing that until "MIPS: Remove SMTC Support" hits
>> mainline?
>>
>>
>> Paul Bolle
> 
> Hi Paul,
> 
> I talked to Ralf yesterday. It seems the patch was not applied correctly
> and there are a few traces left. My original patch definitely removes
> the traces listed in your patch.
> 
> You can compare the original patch
> 
> https://patchwork.linux-mips.org/patch/6719/
> 
> with the one currently present in upstream-sfr/mips-for-linux-next branch
> 

Note that the cpu-info.h part of Paul's suggested patch is new, due to
code added in b86c2247a20f (MIPS: Add cpu_vpe_id macro).

Cheers
James


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: MIPS: Remove last traces of SMTC Support too?

[Paul Bolle]

Hi Markos,

On Wed, 2014-04-09 at 09:58 +0100, Markos Chandras wrote:
> I talked to Ralf yesterday. It seems the patch was not applied correctly 
> and there are a few traces left. My original patch definitely removes 
> the traces listed in your patch.

Assuming Ralf and you sort this out, and a complete removal of SMTC
support will eventually hit linux-next, I won't be bothering you again.

Thanks,


Paul Bolle

Re: MIPS: Remove last traces of SMTC Support too?

[Markos Chandras]

On 04/09/2014 10:03 AM, Paul Bolle wrote:
> Hi Markos,
>
> On Wed, 2014-04-09 at 09:58 +0100, Markos Chandras wrote:
>> I talked to Ralf yesterday. It seems the patch was not applied correctly
>> and there are a few traces left. My original patch definitely removes
>> the traces listed in your patch.
>
> Assuming Ralf and you sort this out, and a complete removal of SMTC
> support will eventually hit linux-next, I won't be bothering you again.
>
> Thanks,
>
>
> Paul Bolle
>
Hi Paul,

As James pointed out, it seems there are a few traces of SMTC left even 
with my original patch. I will make sure everything is gone in time though.

-- 
markos

Re: MIPS: Remove last traces of SMTC Support too?

[Markos Chandras]

On 04/09/2014 10:03 AM, Paul Bolle wrote:
> Hi Markos,
>
> On Wed, 2014-04-09 at 09:58 +0100, Markos Chandras wrote:
>> I talked to Ralf yesterday. It seems the patch was not applied correctly
>> and there are a few traces left. My original patch definitely removes
>> the traces listed in your patch.
>
> Assuming Ralf and you sort this out, and a complete removal of SMTC
> support will eventually hit linux-next, I won't be bothering you again.
>
> Thanks,
>
>
> Paul Bolle
>
Hi Paul,

As James pointed out, it seems there are a few traces of SMTC left even 
with my original patch. I will make sure everything is gone in time though.

-- 
markos