[tip:x86/cpu] x86, CPU, AMD: Drop useless label
Commit-ID: 1077c932db63ecc571c31df1c24d4a44e30928e5 Gitweb: http://git.kernel.org/tip/1077c932db63ecc571c31df1c24d4a44e30928e5 Author: Borislav Petkov AuthorDate: Mon, 8 Apr 2013 17:57:46 +0200 Committer: Borislav Petkov CommitDate: Tue, 16 Apr 2013 11:50:51 +0200 x86, CPU, AMD: Drop useless label All we want to do is return from this function so stop jumping around like a flea for no good reason. Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/136543-9837-5-git-send-email...@alien8.de Signed-off-by: H. Peter Anvin --- arch/x86/kernel/cpu/amd.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index cea02d7..5013a48 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) /* Athlon 660/661 is valid. */ if ((c->x86_model == 6) && ((c->x86_mask == 0) || (c->x86_mask == 1))) - goto valid_k7; + return; /* Duron 670 is valid */ if ((c->x86_model == 7) && (c->x86_mask == 0)) - goto valid_k7; + return; /* * Athlon 662, Duron 671, and Athlon >model 7 have capability @@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) ((c->x86_model == 7) && (c->x86_mask >= 1)) || (c->x86_model > 7)) if (cpu_has_mp) - goto valid_k7; + return; /* If we get here, not a certified SMP capable AMD system. */ @@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) WARN_ONCE(1, "WARNING: This combination of AMD" " processors is not suitable for SMP.\n"); add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE); - -valid_k7: - ; } static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[tip:x86/cpu] x86, CPU, AMD: Drop useless label
Commit-ID: 1077c932db63ecc571c31df1c24d4a44e30928e5 Gitweb: http://git.kernel.org/tip/1077c932db63ecc571c31df1c24d4a44e30928e5 Author: Borislav Petkov b...@suse.de AuthorDate: Mon, 8 Apr 2013 17:57:46 +0200 Committer: Borislav Petkov b...@suse.de CommitDate: Tue, 16 Apr 2013 11:50:51 +0200 x86, CPU, AMD: Drop useless label All we want to do is return from this function so stop jumping around like a flea for no good reason. Signed-off-by: Borislav Petkov b...@suse.de Link: http://lkml.kernel.org/r/136543-9837-5-git-send-email...@alien8.de Signed-off-by: H. Peter Anvin h...@zytor.com --- arch/x86/kernel/cpu/amd.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index cea02d7..5013a48 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) /* Athlon 660/661 is valid. */ if ((c-x86_model == 6) ((c-x86_mask == 0) || (c-x86_mask == 1))) - goto valid_k7; + return; /* Duron 670 is valid */ if ((c-x86_model == 7) (c-x86_mask == 0)) - goto valid_k7; + return; /* * Athlon 662, Duron 671, and Athlon model 7 have capability @@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) ((c-x86_model == 7) (c-x86_mask = 1)) || (c-x86_model 7)) if (cpu_has_mp) - goto valid_k7; + return; /* If we get here, not a certified SMP capable AMD system. */ @@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) WARN_ONCE(1, WARNING: This combination of AMD processors is not suitable for SMP.\n); add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE); - -valid_k7: - ; } static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[tip:x86/cpu] x86, CPU, AMD: Drop useless label
Commit-ID: 042c16f14161fb569fd1a60b908c5196109052da Gitweb: http://git.kernel.org/tip/042c16f14161fb569fd1a60b908c5196109052da Author: Borislav Petkov AuthorDate: Mon, 8 Apr 2013 17:57:46 +0200 Committer: H. Peter Anvin CommitDate: Mon, 8 Apr 2013 09:07:18 -0700 x86, CPU, AMD: Drop useless label All we want to do is return from this function so stop jumping around like a flea for no good reason. Signed-off-by: Borislav Petkov Link: http://lkml.kernel.org/r/136543-9837-5-git-send-email...@alien8.de Signed-off-by: H. Peter Anvin --- arch/x86/kernel/cpu/amd.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index cea02d7..5013a48 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) /* Athlon 660/661 is valid. */ if ((c->x86_model == 6) && ((c->x86_mask == 0) || (c->x86_mask == 1))) - goto valid_k7; + return; /* Duron 670 is valid */ if ((c->x86_model == 7) && (c->x86_mask == 0)) - goto valid_k7; + return; /* * Athlon 662, Duron 671, and Athlon >model 7 have capability @@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) ((c->x86_model == 7) && (c->x86_mask >= 1)) || (c->x86_model > 7)) if (cpu_has_mp) - goto valid_k7; + return; /* If we get here, not a certified SMP capable AMD system. */ @@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) WARN_ONCE(1, "WARNING: This combination of AMD" " processors is not suitable for SMP.\n"); add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE); - -valid_k7: - ; } static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[tip:x86/cpu] x86, CPU, AMD: Drop useless label
Commit-ID: 042c16f14161fb569fd1a60b908c5196109052da Gitweb: http://git.kernel.org/tip/042c16f14161fb569fd1a60b908c5196109052da Author: Borislav Petkov b...@suse.de AuthorDate: Mon, 8 Apr 2013 17:57:46 +0200 Committer: H. Peter Anvin h...@zytor.com CommitDate: Mon, 8 Apr 2013 09:07:18 -0700 x86, CPU, AMD: Drop useless label All we want to do is return from this function so stop jumping around like a flea for no good reason. Signed-off-by: Borislav Petkov b...@suse.de Link: http://lkml.kernel.org/r/136543-9837-5-git-send-email...@alien8.de Signed-off-by: H. Peter Anvin h...@zytor.com --- arch/x86/kernel/cpu/amd.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index cea02d7..5013a48 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) /* Athlon 660/661 is valid. */ if ((c-x86_model == 6) ((c-x86_mask == 0) || (c-x86_mask == 1))) - goto valid_k7; + return; /* Duron 670 is valid */ if ((c-x86_model == 7) (c-x86_mask == 0)) - goto valid_k7; + return; /* * Athlon 662, Duron 671, and Athlon model 7 have capability @@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) ((c-x86_model == 7) (c-x86_mask = 1)) || (c-x86_model 7)) if (cpu_has_mp) - goto valid_k7; + return; /* If we get here, not a certified SMP capable AMD system. */ @@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c) WARN_ONCE(1, WARNING: This combination of AMD processors is not suitable for SMP.\n); add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE); - -valid_k7: - ; } static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
