Commit bcea36df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanup from Ingo Molnar:
 "Inline optimizations"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix non-static inlines
parents 05e30f01 a3819e3e

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

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)

{

}