Skip to contentSkip to conversation

Linux 2.6.0-test6

DISCUSSION Oliver Pitzeier 7 participants 8 messages Sep 28, 2003 – Sep 29, 2003

lore
Share & tools
lore
#0 lore raw

Hi folks/Linus!

Quoted 5 lines · Linus Torvalds

Ok, too long between test5 and test6 again, so the patch is pretty big. Lots of driver updates and architectures fixed, but also lots of merges from Andrew Morton. Most notably perhaps Con's scheduler changes that have been discussed extensively and made it into the -mm tree for testing.

It work's on my Intel machine, but on Alpha, I get this:
<snip>

  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1

kernel/built-in.o: In function `try_to_wake_up':
kernel/built-in.o(.text+0x438): undefined reference to sched_clock' kernel/built-in.o(.text+0x43c): undefined reference to sched_clock' kernel/built-in.o: In function `schedule':
kernel/built-in.o(.text+0x13e4): undefined reference to sched_clock' kernel/built-in.o(.text+0x13ec): undefined reference to sched_clock' kernel/built-in.o: In function `copy_process':
kernel/built-in.o(.text+0x5014): undefined reference to sched_clock' kernel/built-in.o(.text+0x503c): more undefined references to sched_clock' follow fs/built-in.o: In function `smb_fill_super':
fs/built-in.o(.text+0xc9618): undefined reference to low2highuid' fs/built-in.o(.text+0xc9624): undefined reference to low2highuid' fs/built-in.o(.text+0xc963c): undefined reference to low2highuid' fs/built-in.o(.text+0xc9640): undefined reference to low2highuid'
make: *** [.tmp_vmlinux1] Error 1

If you need more information please ask me (CC: me please).

Best,
Oliver

#1 lore raw
Quoted 12 lines · Oliver Pitzeier
Quoted 5 lines · Linus Torvalds

Ok, too long between test5 and test6 again, so the patch is pretty big. Lots of driver updates and architectures fixed, but also lots of merges from Andrew Morton. Most notably perhaps Con's scheduler changes that have been discussed extensively and made it into the -mm tree for testing.

It work's on my Intel machine, but on Alpha, I get this:
<snip>

  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1
Quoted 9 lines

kernel/built-in.o: In function `try_to_wake_up':
kernel/built-in.o(.text+0x438): undefined reference to sched_clock' kernel/built-in.o(.text+0x43c): undefined reference to sched_clock' kernel/built-in.o: In function `schedule':
kernel/built-in.o(.text+0x13e4): undefined reference to sched_clock' kernel/built-in.o(.text+0x13ec): undefined reference to sched_clock' kernel/built-in.o: In function `copy_process':
kernel/built-in.o(.text+0x5014): undefined reference to sched_clock' kernel/built-in.o(.text+0x503c): more undefined references to sched_clock' follow

There's a new architecture-specific routine sched_clock() to be implemented (which was BTW not announced on the secret all-architectures mail alias ;-).

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
Quoted 3 lines · Geert Uytterhoeven

There's a new architecture-specific routine sched_clock() to be implemented
(which was BTW not announced on the secret all-architectures mail alias ;-).

Was too! On September 18.

I considered providing a default implementation, but really, if the hardware has a higher resolution timer then sched_clock() should use that. Providing a HZ-based default would lessen the likelihood of the Alpha developers doing this properly.

#3 lore raw
Quoted 6 lines · Andrew Morton
Quoted 3 lines · Geert Uytterhoeven

There's a new architecture-specific routine sched_clock() to be implemented
(which was BTW not announced on the secret all-architectures mail alias ;-).

Was too! On September 18.

Did someone remove linux-m68k from the alias? I just checked my mail archives, and I didn't receive it.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#4 lore raw
Quoted 10 lines · Geert Uytterhoeven
Quoted 6 lines · Andrew Morton
Quoted 3 lines · Geert Uytterhoeven

There's a new architecture-specific routine sched_clock() to be implemented
(which was BTW not announced on the secret all-architectures mail alias ;-).

Was too! On September 18.

Did someone remove linux-m68k from the alias? I just checked my mail archives, and I didn't receive it.

I can confirm that no mail was received from the mail alias for the week including September 18th. Maybe the mail about sched_clock() never made it to the alias in the first place?

Signature · 4 lines
Russell King ([email protected])	http://www.arm.linux.org.uk/personal/
      Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
      maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                      2.6 Serial core
#5 lore raw
Quoted 4 lines

I can confirm that no mail was received from the mail alias for the week including September 18th. Maybe the mail about sched_clock() never made it to the alias in the first place?

I got it just fine:

Quoted 1 line

From [email protected] Thu Sep 18 20:09:05 2003

Date: Thu, 18 Sep 2003 12:45:52 -0700
From: Andrew Morton <[email protected]>
Subject: sched_clock implementation
Message-Id: <[email protected]>

I'll be merging Ingo & Con's CPOU scheduler changes into Linus's tree soon.

It does require that the architecture provides a new timing function:

...

#6 lore raw
In reply to Oliver Pitzeier
Quoted 9 lines · Oliver Pitzeier

Hi folks/Linus!

Quoted 5 lines · Linus Torvalds

Ok, too long between test5 and test6 again, so the patch is pretty big. Lots of driver updates and architectures fixed, but also lots of merges from Andrew Morton. Most notably perhaps Con's scheduler changes that have been discussed extensively and made it into the -mm tree for testing.

Quoted 7 lines

It work's on my Intel machine, but on Alpha, I get this:
<snip>

  CC      init/version.o
  LD      init/built-in.o
  LD      .tmp_vmlinux1

kernel/built-in.o: In function `try_to_wake_up':
kernel/built-in.o(.text+0x438): undefined reference to `sched_clock'

Add
unsigned long long default_sched_clock(void)

{
	return (unsigned long long)jiffies * (1000000000 / HZ);
}

in kernel/sched.c and

#define sched_clock default_sched_clock

in include/asm-alpha/system.h

FWIW, the former should've been done from the very beginning and sched_clock should've been made a weak alias for default_sched_clock. That would avoid the breakage of platforms original patch didn't update.

BTW, how about adding weak_alias(type, name, args, default_variant) to compiler.h? For most platforms it would be

#define weak_alias(type, name, args, default_variant) \
	type name args __attribute__((weak, alias(#default_variant)));

Note that we already have something similar - cond_syscall(name) would become weak_alias(asmlinkage long, name, (void), sys_ni_syscall) and platform-specific stuff could be taken from current definitions of this beast.

#7 lore raw
In reply to Oliver Pitzeier
Quoted 2 lines · Oliver Pitzeier

Hi folks/Linus!

<snip>

Quoted 2 lines

It work's on my Intel machine, but on Alpha, I get this:
<snip>

<snip, snip>

Quoted 6 lines

fs/built-in.o: In function `smb_fill_super':
fs/built-in.o(.text+0xc9618): undefined reference to low2highuid' fs/built-in.o(.text+0xc9624): undefined reference to low2highuid' fs/built-in.o(.text+0xc963c): undefined reference to low2highuid' fs/built-in.o(.text+0xc9640): undefined reference to low2highuid'
make: *** [.tmp_vmlinux1] Error 1

This patch should solve this.

Linus, please apply unless you dislike OLD_TO_NEW_GID. smbfs is the only user of it and could check CONFIG_UID16 itself.

/Urban

fs/smbfs/inode.c renamed from fs/smbfs/inode.c-orig +2 -2
@@ -551,8 +551,8 @@
 	if (ver == SMB_MOUNT_OLDVERSION) {
 		mnt->version = oldmnt->version;
 
-		mnt->uid = low2highuid(oldmnt->uid);
-		mnt->gid = low2highuid(oldmnt->gid);
+		mnt->uid = OLD_TO_NEW_UID(oldmnt->uid);
+		mnt->gid = OLD_TO_NEW_GID(oldmnt->gid);
 
 		mnt->file_mode = (oldmnt->file_mode & S_IRWXUGO) | S_IFREG;
 		mnt->dir_mode = (oldmnt->dir_mode & S_IRWXUGO) | S_IFDIR;
include/linux/highuid.h renamed from include/linux/highuid.h-orig +4 -0
@@ -56,6 +56,8 @@
 #define SET_GID16(var, gid)	var = high2lowgid(gid)
 #define NEW_TO_OLD_UID(uid)	high2lowuid(uid)
 #define NEW_TO_OLD_GID(gid)	high2lowgid(gid)
+#define OLD_TO_NEW_UID(uid)	low2highuid(uid)
+#define OLD_TO_NEW_GID(gid)	low2highgid(gid)
 
 /* specific to fs/stat.c */
 #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = high2lowuid(uid)
@@ -69,6 +71,8 @@
 #define SET_GID16(var, gid)	do { ; } while (0)
 #define NEW_TO_OLD_UID(uid)	(uid)
 #define NEW_TO_OLD_GID(gid)	(gid)
+#define OLD_TO_NEW_UID(uid)	(uid)
+#define OLD_TO_NEW_GID(gid)	(gid)
 
 #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = (uid)
 #define SET_OLDSTAT_GID(stat, gid)	(stat).st_gid = (gid)