Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f0ed5b9a28536b8be2f578a9450cfa42ab31ccf8

Authored by Linus Torvalds
2 parents a520458fcc 8030c36d13
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, atomic: atomic64_read() take a const pointer
  x86, UV: Update Boot messages for SGI UV2 platform

Showing 2 changed files Side-by-side Diff

arch/x86/include/asm/atomic64_32.h
Diff comments   View file @ f0ed5b9
... ... @@ -82,7 +82,7 @@
82 82 *
83 83 * Atomically reads the value of @v and returns it.
84 84 */
85   -static inline long long atomic64_read(atomic64_t *v)
  85 +static inline long long atomic64_read(const atomic64_t *v)
86 86 {
87 87 long long r;
88 88 asm volatile(ATOMIC64_ALTERNATIVE(read)
arch/x86/kernel/apic/x2apic_uv_x.c
Diff comments   View file @ f0ed5b9
... ... @@ -769,7 +769,12 @@
769 769 for(i = 0; i < UVH_NODE_PRESENT_TABLE_DEPTH; i++)
770 770 uv_possible_blades +=
771 771 hweight64(uv_read_local_mmr( UVH_NODE_PRESENT_TABLE + i * 8));
772   - printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());
  772 +
  773 + /* uv_num_possible_blades() is really the hub count */
  774 + printk(KERN_INFO "UV: Found %d blades, %d hubs\n",
  775 + is_uv1_hub() ? uv_num_possible_blades() :
  776 + (uv_num_possible_blades() + 1) / 2,
  777 + uv_num_possible_blades());
773 778  
774 779 bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
775 780 uv_blade_info = kzalloc(bytes, GFP_KERNEL);