Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Explicit alignment for .data.cacheline_aligned
  powerpc/ps3: Update ps3_defconfig
  powerpc/ftrace: Fix constraint to be early clobber
  powerpc/ftrace: Use pr_devel() in ftrace.c
  powerpc: Do not assert pte_locked for hugepage PTE entries
parents ee3af6ee 0e337b42

arch/powerpc/configs/ps3_defconfig

+62 −43
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc8

# Fri Mar 13 09:28:45 2009

# Linux kernel version: 2.6.30-rc5

# Fri May 15 10:37:00 2009

#

CONFIG_PPC64=y



#

# Processor support

#

CONFIG_PPC_BOOK3S=y

# CONFIG_POWER4_ONLY is not set

CONFIG_POWER3=y

CONFIG_POWER4=y
@@ -55,9 +56,11 @@ CONFIG_OF=y 
# CONFIG_GENERIC_TBSYNC is not set

CONFIG_AUDIT_ARCH=y

CONFIG_GENERIC_BUG=y

CONFIG_DTC=y

# CONFIG_DEFAULT_UIMAGE is not set

# CONFIG_PPC_DCR_NATIVE is not set

# CONFIG_PPC_DCR_MMIO is not set

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#
@@ -72,6 +75,7 @@ CONFIG_SWAP=y 
CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE_SYSCTL=y

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set
@@ -88,8 +92,7 @@ CONFIG_CLASSIC_RCU=y 
CONFIG_LOG_BUF_SHIFT=17

# CONFIG_GROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set
@@ -99,6 +102,9 @@ CONFIG_NAMESPACES=y 
# CONFIG_NET_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y
@@ -107,6 +113,7 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

CONFIG_KALLSYMS_ALL=y

CONFIG_KALLSYMS_EXTRA_PASS=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -138,6 +145,7 @@ CONFIG_HAVE_KRETPROBES=y 
CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -150,7 +158,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_STOP_MACHINE=y

CONFIG_BLOCK=y

# CONFIG_BLK_DEV_IO_TRACE is not set

CONFIG_BLK_DEV_BSG=y

# CONFIG_BLK_DEV_INTEGRITY is not set

CONFIG_BLOCK_COMPAT=y
@@ -172,7 +179,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

# CONFIG_PPC_PSERIES is not set

# CONFIG_PPC_ISERIES is not set

# CONFIG_PPC_PMAC is not set
@@ -209,6 +215,7 @@ CONFIG_SPU_FS_64K_LS=y 
# CONFIG_SPU_TRACE is not set

CONFIG_SPU_BASE=y

# CONFIG_PQ2ADS is not set

# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

# CONFIG_IPIC is not set

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set
@@ -279,11 +286,14 @@ CONFIG_PHYS_ADDR_T_64BIT=y 
CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_ARCH_MEMORY_PROBE=y

CONFIG_PPC_HAS_HASH_64K=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_PPC_256K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_SCHED_SMT=y

CONFIG_PROC_DEVICETREE=y
@@ -316,7 +326,6 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y
@@ -389,6 +398,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -396,6 +406,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y 
# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_NET_DROP_MONITOR is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set
@@ -419,11 +430,9 @@ CONFIG_BT_HCIBTUSB=m 
# CONFIG_BT_HCIBFUSB is not set

# CONFIG_BT_HCIVHCI is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

CONFIG_CFG80211=m

# CONFIG_CFG80211_REG_DEBUG is not set

CONFIG_NL80211=y

# CONFIG_WIRELESS_OLD_REGULATORY is not set

CONFIG_WIRELESS_EXT=y

# CONFIG_WIRELESS_EXT_SYSFS is not set
@@ -602,6 +611,7 @@ CONFIG_SCSI_WAIT_SCAN=m 
# CONFIG_SCSI_SRP_ATTRS is not set

# CONFIG_SCSI_LOWLEVEL is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set

CONFIG_MD=y

# CONFIG_BLK_DEV_MD is not set
@@ -616,6 +626,7 @@ CONFIG_BLK_DEV_DM=m 
# CONFIG_DM_UEVENT is not set

# CONFIG_MACINTOSH_DRIVERS is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -625,6 +636,8 @@ CONFIG_NETDEVICES=y 
# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=m

# CONFIG_ETHOC is not set

# CONFIG_DNET is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -646,12 +659,13 @@ CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y 
CONFIG_WLAN_80211=y

# CONFIG_LIBERTAS is not set

# CONFIG_LIBERTAS_THINFIRM is not set

# CONFIG_AT76C50X_USB is not set

# CONFIG_USB_ZD1201 is not set

# CONFIG_USB_NET_RNDIS_WLAN is not set

# CONFIG_RTL8187 is not set

# CONFIG_MAC80211_HWSIM is not set

# CONFIG_P54_COMMON is not set

# CONFIG_IWLWIFI_LEDS is not set

# CONFIG_AR9170_USB is not set

# CONFIG_HOSTAP is not set

# CONFIG_B43 is not set

# CONFIG_B43LEGACY is not set
@@ -673,6 +687,7 @@ CONFIG_USB_PEGASUS=m 
CONFIG_USB_USBNET=m

CONFIG_USB_NET_AX8817X=m

# CONFIG_USB_NET_CDCETHER is not set

# CONFIG_USB_NET_CDC_EEM is not set

# CONFIG_USB_NET_DM9601 is not set

# CONFIG_USB_NET_SMSC95XX is not set

# CONFIG_USB_NET_GL620A is not set
@@ -724,28 +739,7 @@ CONFIG_INPUT_EVDEV=m 
#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

# CONFIG_JOYSTICK_ANALOG is not set

# CONFIG_JOYSTICK_A3D is not set

# CONFIG_JOYSTICK_ADI is not set

# CONFIG_JOYSTICK_COBRA is not set

# CONFIG_JOYSTICK_GF2K is not set

# CONFIG_JOYSTICK_GRIP is not set

# CONFIG_JOYSTICK_GRIP_MP is not set

# CONFIG_JOYSTICK_GUILLEMOT is not set

# CONFIG_JOYSTICK_INTERACT is not set

# CONFIG_JOYSTICK_SIDEWINDER is not set

# CONFIG_JOYSTICK_TMDC is not set

# CONFIG_JOYSTICK_IFORCE is not set

# CONFIG_JOYSTICK_WARRIOR is not set

# CONFIG_JOYSTICK_MAGELLAN is not set

# CONFIG_JOYSTICK_SPACEORB is not set

# CONFIG_JOYSTICK_SPACEBALL is not set

# CONFIG_JOYSTICK_STINGER is not set

# CONFIG_JOYSTICK_TWIDJOY is not set

# CONFIG_JOYSTICK_ZHENHUA is not set

# CONFIG_JOYSTICK_JOYDUMP is not set

# CONFIG_JOYSTICK_XPAD is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set
@@ -864,6 +858,7 @@ CONFIG_FB_PS3_DEFAULT_SIZE_M=9 
# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -934,15 +929,17 @@ CONFIG_USB_HIDDEV=y 
#

# Special HID drivers

#

# CONFIG_HID_COMPAT is not set

# CONFIG_HID_A4TECH is not set

# CONFIG_HID_APPLE is not set

# CONFIG_HID_BELKIN is not set

# CONFIG_HID_CHERRY is not set

# CONFIG_HID_CHICONY is not set

# CONFIG_HID_CYPRESS is not set

# CONFIG_DRAGONRISE_FF is not set

# CONFIG_HID_EZKEY is not set

# CONFIG_HID_KYE is not set

# CONFIG_HID_GYRATION is not set

# CONFIG_HID_KENSINGTON is not set

# CONFIG_HID_LOGITECH is not set

# CONFIG_HID_MICROSOFT is not set

# CONFIG_HID_MONTEREY is not set
@@ -950,7 +947,7 @@ CONFIG_USB_HIDDEV=y 
# CONFIG_HID_PANTHERLORD is not set

# CONFIG_HID_PETALYNX is not set

# CONFIG_HID_SAMSUNG is not set

# CONFIG_HID_SONY is not set

CONFIG_HID_SONY=m

# CONFIG_HID_SUNPLUS is not set

# CONFIG_GREENASIA_FF is not set

# CONFIG_HID_TOPSEED is not set
@@ -1012,11 +1009,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may

#



#

# see USB_STORAGE Help for more information

# also be needed; see USB_STORAGE Help for more info

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1058,7 +1055,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set
@@ -1074,6 +1070,7 @@ CONFIG_USB_STORAGE=m 
#

# OTG and related infrastructure

#

# CONFIG_NOP_USB_XCEIV is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set
@@ -1113,8 +1110,10 @@ CONFIG_RTC_INTF_DEV=y 
#

# on-CPU RTC drivers

#

CONFIG_RTC_DRV_PPC=m

# CONFIG_RTC_DRV_GENERIC is not set

CONFIG_RTC_DRV_PS3=m

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -1125,6 +1124,7 @@ CONFIG_EXT2_FS=m 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=m

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set
@@ -1160,6 +1160,11 @@ CONFIG_AUTOFS_FS=m 
CONFIG_AUTOFS4_FS=m

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -1211,6 +1216,7 @@ CONFIG_MISC_FILESYSTEMS=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1223,7 +1229,6 @@ CONFIG_LOCKD_V4=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1283,6 +1288,7 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

CONFIG_BINARY_PRINTF=y



#

# Library routines
@@ -1296,15 +1302,16 @@ CONFIG_CRC_ITU_T=m 
CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=m

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=m

CONFIG_LZO_COMPRESS=m

CONFIG_LZO_DECOMPRESS=m

CONFIG_PLIST=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y

CONFIG_NLATTR=y



#

# Kernel hacking
@@ -1322,6 +1329,9 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set
@@ -1357,12 +1367,15 @@ CONFIG_DEBUG_LIST=y 
# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_NOP_TRACER=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_RING_BUFFER=y

CONFIG_TRACING=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers
@@ -1371,18 +1384,21 @@ CONFIG_TRACING=y 
# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_FTRACE_STARTUP_TEST is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_DYNAMIC_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_PRINT_STACK_DEPTH=64

CONFIG_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_CODE_PATCHING_SELFTEST is not set

# CONFIG_FTR_FIXUP_SELFTEST is not set

# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1415,10 +1431,12 @@ CONFIG_CRYPTO_HASH=y 
CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG=m

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

CONFIG_CRYPTO_GF128MUL=m

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set
@@ -1487,6 +1505,7 @@ CONFIG_CRYPTO_SALSA20=m 
# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

CONFIG_CRYPTO_LZO=m



#

arch/powerpc/kernel/ftrace.c

+11 −11
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ __ftrace_make_nop(struct module *mod, 
	 * 0xe8, 0x4c, 0x00, 0x28,    ld      r2,40(r12)

	 */



	pr_debug("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc);

	pr_devel("ip:%lx jumps to %lx r2: %lx", ip, tramp, mod->arch.toc);



	/* Find where the trampoline jumps to */

	if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
@@ -165,7 +165,7 @@ __ftrace_make_nop(struct module *mod, 
		return -EFAULT;

	}



	pr_debug(" %08x %08x", jmp[0], jmp[1]);

	pr_devel(" %08x %08x", jmp[0], jmp[1]);



	/* verify that this is what we expect it to be */

	if (((jmp[0] & 0xffff0000) != 0x3d820000) ||
@@ -181,18 +181,18 @@ __ftrace_make_nop(struct module *mod, 
	offset = ((unsigned)((unsigned short)jmp[0]) << 16) +

		(int)((short)jmp[1]);



	pr_debug(" %x ", offset);

	pr_devel(" %x ", offset);



	/* get the address this jumps too */

	tramp = mod->arch.toc + offset + 32;

	pr_debug("toc: %lx", tramp);

	pr_devel("toc: %lx", tramp);



	if (probe_kernel_read(jmp, (void *)tramp, 8)) {

		printk(KERN_ERR "Failed to read %lx\n", tramp);

		return -EFAULT;

	}



	pr_debug(" %08x %08x\n", jmp[0], jmp[1]);

	pr_devel(" %08x %08x\n", jmp[0], jmp[1]);



	ptr = ((unsigned long)jmp[0] << 32) + jmp[1];
@@ -269,7 +269,7 @@ __ftrace_make_nop(struct module *mod, 
	 *  0x4e, 0x80, 0x04, 0x20  bctr

	 */



	pr_debug("ip:%lx jumps to %lx", ip, tramp);

	pr_devel("ip:%lx jumps to %lx", ip, tramp);



	/* Find where the trampoline jumps to */

	if (probe_kernel_read(jmp, (void *)tramp, sizeof(jmp))) {
@@ -277,7 +277,7 @@ __ftrace_make_nop(struct module *mod, 
		return -EFAULT;

	}



	pr_debug(" %08x %08x ", jmp[0], jmp[1]);

	pr_devel(" %08x %08x ", jmp[0], jmp[1]);



	/* verify that this is what we expect it to be */

	if (((jmp[0] & 0xffff0000) != 0x3d600000) ||
@@ -293,7 +293,7 @@ __ftrace_make_nop(struct module *mod, 
	if (tramp & 0x8000)

		tramp -= 0x10000;



	pr_debug(" %lx ", tramp);

	pr_devel(" %lx ", tramp);



	if (tramp != addr) {

		printk(KERN_ERR
@@ -402,7 +402,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 
	/* ld r2,40(r1) */

	op[1] = 0xe8410028;



	pr_debug("write to %lx\n", rec->ip);

	pr_devel("write to %lx\n", rec->ip);



	if (probe_kernel_write((void *)ip, op, MCOUNT_INSN_SIZE * 2))

		return -EPERM;
@@ -442,7 +442,7 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 
		return -EINVAL;

	}



	pr_debug("write to %lx\n", rec->ip);

	pr_devel("write to %lx\n", rec->ip);



	if (probe_kernel_write((void *)ip, &op, MCOUNT_INSN_SIZE))

		return -EPERM;
@@ -594,7 +594,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
			PPC_LONG "2b,4b\n"

		".previous"



		: [old] "=r" (old), [faulted] "=r" (faulted)

		: [old] "=&r" (old), [faulted] "=r" (faulted)

		: [parent] "r" (parent), [return_hooker] "r" (return_hooker)

		: "memory"

	);

arch/powerpc/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ SECTIONS 
		*(.data.page_aligned)

	}



	. = ALIGN(L1_CACHE_BYTES);

	.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {

		*(.data.cacheline_aligned)

	}

arch/powerpc/mm/pgtable.c

+2 −1
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address, 
		entry = do_dcache_icache_coherency(entry);

	changed = !pte_same(*(ptep), entry);

	if (changed) {

		if (!(vma->vm_flags & VM_HUGETLB))

			assert_pte_locked(vma->vm_mm, address);

		__ptep_set_access_flags(ptep, entry);

		flush_tlb_page_nohash(vma, address);