projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
arch
/
x86
/
include
/
asm
/
global_data.h
diff --git
a/arch/x86/include/asm/global_data.h
b/arch/x86/include/asm/global_data.h
index
8a96fc9
..
9a2056a
100644
(file)
--- a/
arch/x86/include/asm/global_data.h
+++ b/
arch/x86/include/asm/global_data.h
@@
-29,6
+29,10
@@
/* Architecture-specific global data */
struct arch_global_data {
struct global_data *gd_addr; /* Location of Global Data */
/* Architecture-specific global data */
struct arch_global_data {
struct global_data *gd_addr; /* Location of Global Data */
+ uint64_t tsc_base; /* Initial value returned by rdtsc() */
+ uint32_t tsc_base_kclocks; /* Initial tsc as a kclocks value */
+ uint32_t tsc_prev; /* For show_boot_progress() */
+ void *new_fdt; /* Relocated FDT */
};
#endif
};
#endif
@@
-36,7
+40,7
@@
struct arch_global_data {
#include <asm-generic/global_data.h>
#ifndef __ASSEMBLY__
#include <asm-generic/global_data.h>
#ifndef __ASSEMBLY__
-static inline gd_t *get_fs_gd_ptr(void)
+static inline
__attribute__((no_instrument_function))
gd_t *get_fs_gd_ptr(void)
{
gd_t *gd_ptr;
{
gd_t *gd_ptr;