x86/cleanups change for v4.7

GIT PULL Ingo Molnar 1 participant 1 message May 16, 2016

Subsystems (3)

x86 Crypto API Hpet: x86

lore

Share & tools

lore

Ingo Molnar

author

2016-05-16 18:35 UTC #0 lore raw

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus

# HEAD: a3819e3e71d5000c176918309284a1fa2f133fcf x86: Fix non-static inlines

Inline optimizations.

Thanks,

Ingo

------------------>
Denys Vlasenko (1):
x86: Fix non-static inlines

 arch/x86/crypto/sha-mb/sha1_mb.c  | 4 ++--
 arch/x86/kernel/hpet.c            | 2 +-
 arch/x86/kernel/pci-iommu_table.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

arch/x86/crypto/sha-mb/sha1_mb.c +2 -2

index a8a0224fa0f8..fb9c7a84700c 100644
@@ -102,14 +102,14 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_submit)(struct sha1_mb_mgr *st
 static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)(struct sha1_mb_mgr *state);
 static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)(struct sha1_mb_mgr *state);
 
-inline void sha1_init_digest(uint32_t *digest)
+static inline void sha1_init_digest(uint32_t *digest)
 {
 	static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0,
 					SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 };
 	memcpy(digest, initial_digest, sizeof(initial_digest));
 }
 
-inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
+static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2],
 			 uint32_t total_len)
 {
 	uint32_t i = total_len & (SHA1_BLOCK_SIZE - 1);

arch/x86/kernel/hpet.c +1 -1

index a1f0e4a5c47e..130f2b4b8ecb 100644
@@ -54,7 +54,7 @@ struct hpet_dev {
 	char				name[10];
 };
 
-inline struct hpet_dev *EVT_TO_HPET_DEV(struct clock_event_device *evtdev)
+static inline struct hpet_dev *EVT_TO_HPET_DEV(struct clock_event_device *evtdev)
 {
 	return container_of(evtdev, struct hpet_dev, evt);
 }

arch/x86/kernel/pci-iommu_table.c +1 -1

index 35ccf75696eb..f712dfdf1357 100644
@@ -72,7 +72,7 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
 	}
 }
 #else
-inline void check_iommu_entries(struct iommu_table_entry *start,
+void __init check_iommu_entries(struct iommu_table_entry *start,
 				       struct iommu_table_entry *finish)
 {
 }