lkml.org 
[lkml]   [2005]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: 2.6.15-rc5-rt1 will not compile (was Re: 2.6.14-rt15: cannot build with !PREEMPT_RT)
    From
    Date
    On Mon, 2005-12-12 at 17:31 -0500, Lee Revell wrote:
    > On Mon, 2005-12-12 at 17:22 -0500, Steven Rostedt wrote:
    > > On Mon, 2005-12-12 at 17:14 -0500, Lee Revell wrote:
    > >
    > > >
    > > > The patch had no effect.
    > >
    > > The patch should work for krfoley though. His errors where the same
    > > that I had for i386. I also have it working under x86_64.
    > > >
    > > > In fact x86-64 does not set CONFIG_RWSEM_XCHGADD_ALGORITHM so this test
    > > > in include/linux/rwsem.h causes asm/rwsem.h to be included which does
    > > > not exist on x86-64:
    > >
    > > Yeah OK, you have a different problem. Did you post your .config? You
    > > can send it privately to me if you haven't already posted it.
    >
    > Yes I posted the .config earlier in the thread. Let me know if you want
    > me to resend it to you.

    Here Lee,

    I got it to compile, but I haven't yet tried to boot it. As a matter of
    fact, I haven't booted any 2.6.15-rc5-rt1 on any of my machines. I must
    trust Ingo too much, since I started porting my kernel to his before
    testing it to see if it works without my changes. Oh well, I know what
    to do tomorrow.

    Well, this compiles, you can see if it boots ;-)

    -- Steve

    Index: linux-2.6.15-rc5-rt1/arch/x86_64/Kconfig
    ===================================================================
    --- linux-2.6.15-rc5-rt1.orig/arch/x86_64/Kconfig 2005-12-12 10:56:37.000000000 -0500
    +++ linux-2.6.15-rc5-rt1/arch/x86_64/Kconfig 2005-12-12 21:33:56.000000000 -0500
    @@ -240,7 +240,6 @@

    config RWSEM_GENERIC_SPINLOCK
    bool
    - depends on PREEMPT_RT
    default y

    config RWSEM_XCHGADD_ALGORITHM
    Index: linux-2.6.15-rc5-rt1/include/asm-x86_64/semaphore.h
    ===================================================================
    --- linux-2.6.15-rc5-rt1.orig/include/asm-x86_64/semaphore.h 2005-12-12 10:56:37.000000000 -0500
    +++ linux-2.6.15-rc5-rt1/include/asm-x86_64/semaphore.h 2005-12-12 22:13:08.000000000 -0500
    @@ -104,6 +104,7 @@
    asmlinkage int __compat_down_interruptible(struct compat_semaphore * sem);
    asmlinkage int __compat_down_trylock(struct compat_semaphore * sem);
    asmlinkage void __compat_up(struct compat_semaphore * sem);
    +asmlinkage int compat_sem_is_locked(struct compat_semaphore *sem);

    /*
    * This is ugly, but we want the default case to fall through.
    @@ -199,5 +200,10 @@
    :"D" (sem)
    :"memory");
    }
    +
    +#ifndef CONFIG_PREEMPT_RT
    +# include <linux/semaphore.h>
    +#endif
    +
    #endif /* __KERNEL__ */
    #endif
    Index: linux-2.6.15-rc5-rt1/include/linux/rwsem.h
    ===================================================================
    --- linux-2.6.15-rc5-rt1.orig/include/linux/rwsem.h 2005-12-12 10:56:37.000000000 -0500
    +++ linux-2.6.15-rc5-rt1/include/linux/rwsem.h 2005-12-12 22:13:00.000000000 -0500
    @@ -163,6 +163,10 @@
    {
    compat_downgrade_write(rwsem);
    }
    +static inline int rwsem_is_locked(struct compat_rw_semaphore *sem)
    +{
    + return compat_rwsem_is_locked(sem);
    +}
    #endif /* CONFIG_PREEMPT_RT */

    #endif /* __KERNEL__ */

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-12-13 04:31    [W:3.592 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site