refresh against -rc7
SVN-Revision: 36340
This commit is contained in:
		| @@ -243,7 +243,7 @@ | |||||||
|          will be called when part or all of the page is to be removed |          will be called when part or all of the page is to be removed | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -5911,6 +5911,13 @@ F:	drivers/scsi/osd/ | @@ -5917,6 +5917,13 @@ F:	drivers/scsi/osd/ | ||||||
|  F:	include/scsi/osd_* |  F:	include/scsi/osd_* | ||||||
|  F:	fs/exofs/ |  F:	fs/exofs/ | ||||||
|   |   | ||||||
|   | |||||||
| @@ -64,7 +64,7 @@ | |||||||
|  #include <linux/mutex.h> |  #include <linux/mutex.h> | ||||||
|  #include <linux/err.h> |  #include <linux/err.h> | ||||||
|  #include <linux/rbtree.h> |  #include <linux/rbtree.h> | ||||||
| @@ -1778,3 +1779,5 @@ static int __init regmap_initcall(void) | @@ -1779,3 +1780,5 @@ static int __init regmap_initcall(void) | ||||||
|  	return 0; |  	return 0; | ||||||
|  } |  } | ||||||
|  postcore_initcall(regmap_initcall); |  postcore_initcall(regmap_initcall); | ||||||
|   | |||||||
| @@ -106,7 +106,7 @@ | |||||||
|  { |  { | ||||||
| --- a/block/partition-generic.c | --- a/block/partition-generic.c | ||||||
| +++ b/block/partition-generic.c | +++ b/block/partition-generic.c | ||||||
| @@ -549,6 +549,7 @@ int invalidate_partitions(struct gendisk | @@ -548,6 +548,7 @@ int invalidate_partitions(struct gendisk | ||||||
|   |   | ||||||
|  	return 0; |  	return 0; | ||||||
|  } |  } | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ commont qdiscs. | |||||||
|  	} |  	} | ||||||
| --- a/net/sched/sch_fifo.c | --- a/net/sched/sch_fifo.c | ||||||
| +++ b/net/sched/sch_fifo.c | +++ b/net/sched/sch_fifo.c | ||||||
| @@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff  | @@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff | ||||||
|   |   | ||||||
|  static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch) |  static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -45,7 +45,7 @@ | |||||||
|  /** |  /** | ||||||
|   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer |   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer | ||||||
|   *	@skb: buffer to alter |   *	@skb: buffer to alter | ||||||
| @@ -1892,16 +1896,6 @@ static inline struct sk_buff *dev_alloc_ | @@ -1910,16 +1914,6 @@ static inline struct sk_buff *dev_alloc_ | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   |   | ||||||
|   | |||||||
| @@ -52,7 +52,7 @@ | |||||||
|   * When we die, we re-parent all our children, and try to: |   * When we die, we re-parent all our children, and try to: | ||||||
| --- a/kernel/sched/core.c | --- a/kernel/sched/core.c | ||||||
| +++ b/kernel/sched/core.c | +++ b/kernel/sched/core.c | ||||||
| @@ -3671,6 +3671,7 @@ int can_nice(const struct task_struct *p | @@ -3673,6 +3673,7 @@ int can_nice(const struct task_struct *p | ||||||
|  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || |  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || | ||||||
|  		capable(CAP_SYS_NICE)); |  		capable(CAP_SYS_NICE)); | ||||||
|  } |  } | ||||||
| @@ -62,7 +62,7 @@ | |||||||
|   |   | ||||||
| --- a/mm/memory.c | --- a/mm/memory.c | ||||||
| +++ b/mm/memory.c | +++ b/mm/memory.c | ||||||
| @@ -1412,6 +1412,7 @@ void zap_page_range(struct vm_area_struc | @@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc | ||||||
|  	mmu_notifier_invalidate_range_end(mm, start, end); |  	mmu_notifier_invalidate_range_end(mm, start, end); | ||||||
|  	tlb_finish_mmu(&tlb, start, end); |  	tlb_finish_mmu(&tlb, start, end); | ||||||
|  } |  } | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/arch/arm/kernel/smp_twd.c | --- a/arch/arm/kernel/smp_twd.c | ||||||
| +++ b/arch/arm/kernel/smp_twd.c | +++ b/arch/arm/kernel/smp_twd.c | ||||||
| @@ -186,7 +186,7 @@ core_initcall(twd_cpufreq_init); | @@ -188,7 +188,7 @@ core_initcall(twd_cpufreq_init); | ||||||
|   |   | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -9,7 +9,7 @@ | |||||||
|  { |  { | ||||||
|  	unsigned long count; |  	unsigned long count; | ||||||
|  	u64 waitjiffies; |  	u64 waitjiffies; | ||||||
| @@ -223,8 +223,11 @@ static void __cpuinit twd_calibrate_rate | @@ -225,8 +225,11 @@ static void __cpuinit twd_calibrate_rate | ||||||
|  		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, |  		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, | ||||||
|  			(twd_timer_rate / 10000) % 100); |  			(twd_timer_rate / 10000) % 100); | ||||||
|  	} |  	} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Imre Kaloz
					Imre Kaloz