linux-kernel - [tip:x86/intel-mid] x86: Don' t add new __cpuinit users to Merrifield platform code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-47683f7fe5d2abd71bf08b42060bcf95e0ad668f@git.kernel.org>
Date:	Wed, 22 Jan 2014 14:30:26 -0800
From:	tip-bot for Paul Gortmaker <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	fei.yang@...el.com, david.a.cohen@...ux.intel.com,
	tglx@...utronix.de, hpa@...ux.intel.com,
	paul.gortmaker@...driver.com
Subject: [tip:x86/intel-mid] x86: Don'
 t add new __cpuinit users to Merrifield platform code

Commit-ID:  47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Gitweb:     http://git.kernel.org/tip/47683f7fe5d2abd71bf08b42060bcf95e0ad668f
Author:     Paul Gortmaker <paul.gortmaker@...driver.com>
AuthorDate: Wed, 22 Jan 2014 12:35:25 -0500
Committer:  H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Wed, 22 Jan 2014 14:28:57 -0800

x86: Don't add new __cpuinit users to Merrifield platform code

Commit bc20aa48bbb3068224a1c91f8332971fdb689fad ("x86, intel-mid:
Add Merrifield platform support")  added new instances of __cpuinit
usage.  We removed this a couple versions ago; we now want to remove
the compat no-op stubs.  Introducing new users is not what we want to
see at this point in time, as it will break once the stubs are gone.

This also fixes an out of sync __init vs. __cpuinit -- as the former
is real, and the latter is a no-op; hence it would have been a section
mismatch.

Cc: Fei Yang <fei.yang@...el.com>
Cc: H. Peter Anvin <hpa@...ux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@...driver.com>
Acked-by: David Cohen <david.a.cohen@...ux.intel.com>
Link: http://lkml.kernel.org/r/1390412125-19439-1-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
 arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 2 +-
 arch/x86/platform/intel-mid/mrfl.c                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
index 41fe17d..46aa25c 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -16,4 +16,4 @@
  */
 extern void *get_penwell_ops(void) __attribute__((weak));
 extern void *get_cloverview_ops(void) __attribute__((weak));
-extern void * __init get_tangier_ops(void) __attribute__((weak));
+extern void *get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
index 09d1015..28b636a 100644
--- a/arch/x86/platform/intel-mid/mrfl.c
+++ b/arch/x86/platform/intel-mid/mrfl.c
@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
 	.arch_setup = tangier_arch_setup,
 };
 
-void * __cpuinit get_tangier_ops()
+void *get_tangier_ops()
 {
 	return &tangier_ops;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/