Skip to content

Commit 32988cf

Browse files
Christoph HellwigKAGA-KOKO
authored andcommitted
x86/platform/uv: Remove the uv_partition_coherence_id() macro
uv_partition_coherence_id() is only used once. Just open code it in the only user. Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Not-acked-by: Dimitri Sivanich <[email protected]> Cc: Russ Anderson <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 30ad8db commit 32988cf

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

arch/x86/include/asm/uv/bios.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ extern long sn_partition_id;
140140
extern long sn_coherency_id;
141141
extern long sn_region_size;
142142
extern long system_serial_number;
143-
#define uv_partition_coherence_id() (sn_coherency_id)
144143

145144
extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */
146145

arch/x86/platform/uv/uv_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static ssize_t partition_id_show(struct kobject *kobj,
2121
static ssize_t coherence_id_show(struct kobject *kobj,
2222
struct kobj_attribute *attr, char *buf)
2323
{
24-
return snprintf(buf, PAGE_SIZE, "%ld\n", uv_partition_coherence_id());
24+
return snprintf(buf, PAGE_SIZE, "%ld\n", sn_coherency_id);
2525
}
2626

2727
static struct kobj_attribute partition_id_attr =

0 commit comments

Comments
 (0)