From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755336AbcDDLma (ORCPT ); Mon, 4 Apr 2016 07:42:30 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34721 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753282AbcDDLm2 (ORCPT ); Mon, 4 Apr 2016 07:42:28 -0400 From: Sudip Mukherjee To: Ralf Baechle Cc: linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org, linux-mips@linux-mips.org, Sudip Mukherjee Subject: [PATCH] MIPS: remove duplicate definition Date: Mon, 4 Apr 2016 17:12:15 +0530 Message-Id: <1459770135-6228-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org mips defconfig and allmodconfig are failing with the error: In file included from ../arch/mips/kernel/asm-offsets.c:13:0: include/linux/sched.h:2656:20: error: conflicting types for 'exit_thread' exit_thread() was already defined in include/linux/sched.h. Fixes: 8664c52c094e ("MIPS: Make flush_thread and exit_thread inline.") Signed-off-by: Sudip Mukherjee --- build log of next-20160404 is at: https://travis-ci.org/sudipm-mukherjee/parport/jobs/120536697 (defconfig) https://travis-ci.org/sudipm-mukherjee/parport/jobs/120536714 (allmodconfig) patch has been build tested with defconfig and allmodconfig. arch/mips/include/asm/processor.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 06469df..cfa15ba 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h @@ -359,10 +359,6 @@ static inline void flush_thread(void) { } -static inline void exit_thread(void) -{ -} - unsigned long get_wchan(struct task_struct *p); #define __KSTK_TOS(tsk) ((unsigned long)task_stack_page(tsk) + \ -- 1.9.1