---

yaml
---
r: 180645
b: refs/heads/master
c: 97c169d
h: refs/heads/master
i:
  180643: 2174da6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86404ab60df2ea65f39be936fc11762b642810c3
+refs/heads/master: 97c169d39b6846a564dc8d883832e7fef9bdb77d

trunk/arch/ia64/include/asm/elf.h

@@ -201,9 +201,7 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst);
    relevant until we have real hardware to play with... */
 #define ELF_PLATFORM	NULL
 
-#define SET_PERSONALITY(ex)	\
-	set_personality((current->personality & ~PER_MASK) | PER_LINUX)
-
+#define SET_PERSONALITY(ex)	set_personality(PER_LINUX)
 #define elf_read_implies_exec(ex, executable_stack)					\
 	((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)
 

trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c

@@ -338,8 +338,7 @@ static void __init mpc85xx_mds_pic_init(void)
 	}
 
 	mpic = mpic_alloc(np, r.start,
-			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN |
-			MPIC_BROKEN_FRR_NIRQS,
+			MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
 			0, 256, " OpenPIC  ");
 	BUG_ON(mpic == NULL);
 	of_node_put(np);

trunk/arch/powerpc/platforms/85xx/smp.c

@@ -46,7 +46,6 @@ smp_85xx_kick_cpu(int nr)
 	__iomem u32 *bptr_vaddr;
 	struct device_node *np;
 	int n = 0;
-	int ioremappable;
 
 	WARN_ON (nr < 0 || nr >= NR_CPUS);
 
@@ -60,37 +59,21 @@ smp_85xx_kick_cpu(int nr)
 		return;
 	}
 
-	/*
-	 * A secondary core could be in a spinloop in the bootpage
-	 * (0xfffff000), somewhere in highmem, or somewhere in lowmem.
-	 * The bootpage and highmem can be accessed via ioremap(), but
-	 * we need to directly access the spinloop if its in lowmem.
-	 */
-	ioremappable = *cpu_rel_addr > virt_to_phys(high_memory);
-
 	/* Map the spin table */
-	if (ioremappable)
-		bptr_vaddr = ioremap(*cpu_rel_addr, SIZE_BOOT_ENTRY);
-	else
-		bptr_vaddr = phys_to_virt(*cpu_rel_addr);
+	bptr_vaddr = ioremap(*cpu_rel_addr, SIZE_BOOT_ENTRY);
 
 	local_irq_save(flags);
 
 	out_be32(bptr_vaddr + BOOT_ENTRY_PIR, nr);
 	out_be32(bptr_vaddr + BOOT_ENTRY_ADDR_LOWER, __pa(__early_start));
 
-	if (!ioremappable)
-		flush_dcache_range((ulong)bptr_vaddr,
-				(ulong)(bptr_vaddr + SIZE_BOOT_ENTRY));
-
 	/* Wait a bit for the CPU to ack. */
 	while ((__secondary_hold_acknowledge != nr) && (++n < 1000))
 		mdelay(1);
 
 	local_irq_restore(flags);
 
-	if (ioremappable)
-		iounmap(bptr_vaddr);
+	iounmap(bptr_vaddr);
 
 	pr_debug("waited %d msecs for CPU #%d.\n", n, nr);
 }

trunk/arch/sh/kernel/ptrace_64.c

@@ -133,17 +133,13 @@ void user_enable_single_step(struct task_struct *child)
 	struct pt_regs *regs = child->thread.uregs;
 
 	regs->sr |= SR_SSTEP;	/* auto-resetting upon exception */
-
-	set_tsk_thread_flag(child, TIF_SINGLESTEP);
 }
 
 void user_disable_single_step(struct task_struct *child)
 {
 	struct pt_regs *regs = child->thread.uregs;
 
 	regs->sr &= ~SR_SSTEP;
-
-	clear_tsk_thread_flag(child, TIF_SINGLESTEP);
 }
 
 static int genregs_get(struct task_struct *target,
@@ -458,18 +454,15 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
 
 asmlinkage void do_syscall_trace_leave(struct pt_regs *regs)
 {
-	int step;
-
 	if (unlikely(current->audit_context))
 		audit_syscall_exit(AUDITSC_RESULT(regs->regs[9]),
 				   regs->regs[9]);
 
 	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
 		trace_sys_exit(regs, regs->regs[9]);
 
-	step = test_thread_flag(TIF_SINGLESTEP);
-	if (step || test_thread_flag(TIF_SYSCALL_TRACE))
-		tracehook_report_syscall_exit(regs, step);
+	if (test_thread_flag(TIF_SYSCALL_TRACE))
+		tracehook_report_syscall_exit(regs, 0);
 }
 
 /* Called with interrupts disabled */

trunk/arch/sh/kernel/signal_64.c

@@ -118,9 +118,7 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset)
 			 * clear the TS_RESTORE_SIGMASK flag.
 			 */
 			current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
-
-			tracehook_signal_handler(signr, &info, &ka, regs,
-					test_thread_flag(TIF_SINGLESTEP));
+			tracehook_signal_handler(signr, &info, &ka, regs, 0);
 			return 1;
 		}
 	}

trunk/arch/x86/include/asm/elf.h

@@ -170,7 +170,10 @@ static inline void elf_common_init(struct thread_struct *t,
 }
 
 #define ELF_PLAT_INIT(_r, load_addr)			\
-	elf_common_init(&current->thread, _r, 0)
+do {							\
+	elf_common_init(&current->thread, _r, 0);	\
+	clear_thread_flag(TIF_IA32);			\
+} while (0)
 
 #define	COMPAT_ELF_PLAT_INIT(regs, load_addr)		\
 	elf_common_init(&current->thread, regs, __USER_DS)

trunk/arch/x86/kernel/acpi/boot.c

@@ -1342,14 +1342,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
 		     DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),
 		     },
 	 },
-	{
-	 .callback = force_acpi_ht,
-	 .ident = "ASUS P2B-DS",
-	 .matches = {
-		     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-		     DMI_MATCH(DMI_BOARD_NAME, "P2B-DS"),
-		     },
-	 },
 	{
 	 .callback = force_acpi_ht,
 	 .ident = "ASUS CUR-DLS",

trunk/arch/x86/kernel/process_64.c

@@ -527,7 +527,6 @@ void set_personality_ia32(void)
 
 	/* Make sure to be in 32bit mode */
 	set_thread_flag(TIF_IA32);
-	current->personality |= force_personality32;
 
 	/* Prepare the first "return" to user space */
 	current_thread_info()->status |= TS_COMPAT;

trunk/drivers/base/class.c

@@ -59,8 +59,6 @@ static void class_release(struct kobject *kobj)
 	else
 		pr_debug("class '%s' does not have a release() function, "
 			 "be careful\n", class->name);
-
-	kfree(cp);
 }
 
 static struct sysfs_ops class_sysfs_ops = {

trunk/drivers/firewire/net.c

@@ -893,32 +893,21 @@ static void fwnet_receive_broadcast(struct fw_iso_context *context,
 
 static struct kmem_cache *fwnet_packet_task_cache;
 
-static void fwnet_free_ptask(struct fwnet_packet_task *ptask)
-{
-	dev_kfree_skb_any(ptask->skb);
-	kmem_cache_free(fwnet_packet_task_cache, ptask);
-}
-
 static int fwnet_send_packet(struct fwnet_packet_task *ptask);
 
 static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
 {
-	struct fwnet_device *dev = ptask->dev;
+	struct fwnet_device *dev;
 	unsigned long flags;
-	bool free;
-
-	spin_lock_irqsave(&dev->lock, flags);
 
-	ptask->outstanding_pkts--;
-
-	/* Check whether we or the networking TX soft-IRQ is last user. */
-	free = (ptask->outstanding_pkts == 0 && !list_empty(&ptask->pt_link));
-
-	if (ptask->outstanding_pkts == 0)
-		list_del(&ptask->pt_link);
+	dev = ptask->dev;
 
+	spin_lock_irqsave(&dev->lock, flags);
+	list_del(&ptask->pt_link);
 	spin_unlock_irqrestore(&dev->lock, flags);
 
+	ptask->outstanding_pkts--; /* FIXME access inside lock */
+
 	if (ptask->outstanding_pkts > 0) {
 		u16 dg_size;
 		u16 fg_off;
@@ -962,10 +951,10 @@ static void fwnet_transmit_packet_done(struct fwnet_packet_task *ptask)
 			ptask->max_payload = skb->len + RFC2374_FRAG_HDR_SIZE;
 		}
 		fwnet_send_packet(ptask);
+	} else {
+		dev_kfree_skb_any(ptask->skb);
+		kmem_cache_free(fwnet_packet_task_cache, ptask);
 	}
-
-	if (free)
-		fwnet_free_ptask(ptask);
 }
 
 static void fwnet_write_complete(struct fw_card *card, int rcode,
@@ -988,7 +977,6 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
 	unsigned tx_len;
 	struct rfc2734_header *bufhdr;
 	unsigned long flags;
-	bool free;
 
 	dev = ptask->dev;
 	tx_len = ptask->max_payload;
@@ -1034,36 +1022,25 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask)
 				generation, SCODE_100, 0ULL, ptask->skb->data,
 				tx_len + 8, fwnet_write_complete, ptask);
 
+		/* FIXME race? */
 		spin_lock_irqsave(&dev->lock, flags);
-
-		/* If the AT tasklet already ran, we may be last user. */
-		free = (ptask->outstanding_pkts == 0 && list_empty(&ptask->pt_link));
-		if (!free)
-			list_add_tail(&ptask->pt_link, &dev->broadcasted_list);
-
+		list_add_tail(&ptask->pt_link, &dev->broadcasted_list);
 		spin_unlock_irqrestore(&dev->lock, flags);
 
-		goto out;
+		return 0;
 	}
 
 	fw_send_request(dev->card, &ptask->transaction,
 			TCODE_WRITE_BLOCK_REQUEST, ptask->dest_node,
 			ptask->generation, ptask->speed, ptask->fifo_addr,
 			ptask->skb->data, tx_len, fwnet_write_complete, ptask);
 
+	/* FIXME race? */
 	spin_lock_irqsave(&dev->lock, flags);
-
-	/* If the AT tasklet already ran, we may be last user. */
-	free = (ptask->outstanding_pkts == 0 && list_empty(&ptask->pt_link));
-	if (!free)
-		list_add_tail(&ptask->pt_link, &dev->sent_list);
-
+	list_add_tail(&ptask->pt_link, &dev->sent_list);
 	spin_unlock_irqrestore(&dev->lock, flags);
 
 	dev->netdev->trans_start = jiffies;
- out:
-	if (free)
-		fwnet_free_ptask(ptask);
 
 	return 0;
 }
@@ -1321,8 +1298,6 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 	spin_unlock_irqrestore(&dev->lock, flags);
 
 	ptask->max_payload = max_payload;
-	INIT_LIST_HEAD(&ptask->pt_link);
-
 	fwnet_send_packet(ptask);
 
 	return NETDEV_TX_OK;

trunk/drivers/firewire/ohci.c

@@ -2101,6 +2101,11 @@ static int ohci_queue_iso_transmit(struct fw_iso_context *base,
 	u32 payload_index, payload_end_index, next_page_index;
 	int page, end_page, i, length, offset;
 
+	/*
+	 * FIXME: Cycle lost behavior should be configurable: lose
+	 * packet, retransmit or terminate..
+	 */
+
 	p = packet;
 	payload_index = payload;
 
@@ -2130,14 +2135,6 @@ static int ohci_queue_iso_transmit(struct fw_iso_context *base,
 	if (!p->skip) {
 		d[0].control   = cpu_to_le16(DESCRIPTOR_KEY_IMMEDIATE);
 		d[0].req_count = cpu_to_le16(8);
-		/*
-		 * Link the skip address to this descriptor itself.  This causes
-		 * a context to skip a cycle whenever lost cycles or FIFO
-		 * overruns occur, without dropping the data.  The application
-		 * should then decide whether this is an error condition or not.
-		 * FIXME:  Make the context's cycle-lost behaviour configurable?
-		 */
-		d[0].branch_address = cpu_to_le32(d_bus | z);
 
 		header = (__le32 *) &d[1];
 		header[0] = cpu_to_le32(IT_HEADER_SY(p->sy) |

trunk/drivers/gpu/drm/drm_edid.c

@@ -598,50 +598,6 @@ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
 	return mode;
 }
 
-/*
- * EDID is delightfully ambiguous about how interlaced modes are to be
- * encoded.  Our internal representation is of frame height, but some
- * HDTV detailed timings are encoded as field height.
- *
- * The format list here is from CEA, in frame size.  Technically we
- * should be checking refresh rate too.  Whatever.
- */
-static void
-drm_mode_do_interlace_quirk(struct drm_display_mode *mode,
-			    struct detailed_pixel_timing *pt)
-{
-	int i;
-	static const struct {
-		int w, h;
-	} cea_interlaced[] = {
-		{ 1920, 1080 },
-		{  720,  480 },
-		{ 1440,  480 },
-		{ 2880,  480 },
-		{  720,  576 },
-		{ 1440,  576 },
-		{ 2880,  576 },
-	};
-	static const int n_sizes =
-		sizeof(cea_interlaced)/sizeof(cea_interlaced[0]);
-
-	if (!(pt->misc & DRM_EDID_PT_INTERLACED))
-		return;
-
-	for (i = 0; i < n_sizes; i++) {
-		if ((mode->hdisplay == cea_interlaced[i].w) &&
-		    (mode->vdisplay == cea_interlaced[i].h / 2)) {
-			mode->vdisplay *= 2;
-			mode->vsync_start *= 2;
-			mode->vsync_end *= 2;
-			mode->vtotal *= 2;
-			mode->vtotal |= 1;
-		}
-	}
-
-	mode->flags |= DRM_MODE_FLAG_INTERLACE;
-}
-
 /**
  * drm_mode_detailed - create a new mode from an EDID detailed timing section
  * @dev: DRM device (needed to create new mode)
@@ -724,7 +680,8 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 
 	drm_mode_set_name(mode);
 
-	drm_mode_do_interlace_quirk(mode, pt);
+	if (pt->misc & DRM_EDID_PT_INTERLACED)
+		mode->flags |= DRM_MODE_FLAG_INTERLACE;
 
 	if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {
 		pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;

trunk/drivers/gpu/drm/drm_mm.c

@@ -405,8 +405,7 @@ struct drm_mm_node *drm_mm_search_free_in_range(const struct drm_mm *mm,
 				wasted += alignment - tmp;
 		}
 
-		if (entry->size >= size + wasted &&
-		    (entry->start + wasted + size) <= end) {
+		if (entry->size >= size + wasted) {
 			if (!best_match)
 				return entry;
 			if (entry->size < best_size) {