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

Commit 0d66cba1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (29 commits)
  [S390] cpu hotplug: fix external interrupt subclass mask handling
  [S390] oprofile: dont access lowcore
  [S390] oprofile: add missing irq stats counter
  [S390] Ignore sendmmsg system call note wired up warning
  [S390] s390,oprofile: fix compile error for !CONFIG_SMP
  [S390] s390,oprofile: fix alert counter increment
  [S390] Remove unused includes in process.c
  [S390] get CPC image name
  [S390] sclp: event buffer dissection
  [S390] chsc: process channel-path-availability information
  [S390] refactor page table functions for better pgste support
  [S390] merge page_test_dirty and page_clear_dirty
  [S390] qdio: prevent compile warning
  [S390] sclp: remove unnecessary sendmask check
  [S390] convert old cpumask API into new one
  [S390] pfault: cleanup code
  [S390] pfault: cpu hotplug vs missing completion interrupts
  [S390] smp: add __noreturn attribute to cpu_die()
  [S390] percpu: implement arch specific irqsafe_cpu_ops
  [S390] vdso: disable gcov profiling
  ...
parents 4637f40f 5bd41878

arch/s390/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -230,17 +230,6 @@ config SYSVIPC_COMPAT 
config AUDIT_ARCH

	def_bool y



config S390_EXEC_PROTECT

	def_bool y

	prompt "Data execute protection"

	help

	  This option allows to enable a buffer overflow protection for user

	  space programs and it also selects the addressing mode option above.

	  The kernel parameter noexec=on will enable this feature and also

	  switch the addressing modes, default is disabled. Enabling this (via

	  kernel parameter) on machines earlier than IBM System z9 this will

	  reduce system performance.



comment "Code generation options"



choice

arch/s390/appldata/appldata_base.c

+0 −2
Original line number Diff line number Diff line
@@ -130,9 +130,7 @@ static void appldata_work_fn(struct work_struct *work) 
{

	struct list_head *lh;

	struct appldata_ops *ops;

	int i;



	i = 0;

	get_online_cpus();

	mutex_lock(&appldata_ops_mutex);

	list_for_each(lh, &appldata_ops_list) {

arch/s390/include/asm/cmpxchg.h

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old, 
#ifdef CONFIG_64BIT

#define cmpxchg64(ptr, o, n)						\

({									\

	BUILD_BUG_ON(sizeof(*(ptr)) != 8);				\

	cmpxchg((ptr), (o), (n));					\

})

#else /* CONFIG_64BIT */

arch/s390/include/asm/elf.h

+0 −12
Original line number Diff line number Diff line
@@ -196,18 +196,6 @@ do { \ 
} while (0)

#endif /* __s390x__ */



/*

 * An executable for which elf_read_implies_exec() returns TRUE will

 * have the READ_IMPLIES_EXEC personality flag set automatically.

 */

#define elf_read_implies_exec(ex, executable_stack)	\

({							\

	if (current->mm->context.noexec &&		\

	    executable_stack != EXSTACK_DISABLE_X)	\

		disable_noexec(current->mm, current);	\

	current->mm->context.noexec == 0;		\

})



#define STACK_RND_MASK	0x7ffUL



#define ARCH_DLINFO							    \

arch/s390/include/asm/hugetlb.h

+3 −14
Original line number Diff line number Diff line
@@ -111,21 +111,10 @@ static inline void huge_ptep_invalidate(struct mm_struct *mm, 
{

	pmd_t *pmdp = (pmd_t *) ptep;



	if (!MACHINE_HAS_IDTE) {

		__pmd_csp(pmdp);

		if (mm->context.noexec) {

			pmdp = get_shadow_table(pmdp);

			__pmd_csp(pmdp);

		}

		return;

	}



	__pmd_idte(address, pmdp);

	if (mm->context.noexec) {

		pmdp = get_shadow_table(pmdp);

	if (MACHINE_HAS_IDTE)

		__pmd_idte(address, pmdp);

	}

	return;

	else

		__pmd_csp(pmdp);

}



#define huge_ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty) \