Revision d22af68bd785fa3cdd1fbf289e0e339f415ab383 authored by Linus Torvalds on 15 August 2014, 23:57:49 UTC, committed by Linus Torvalds on 15 August 2014, 23:57:49 UTC
Pull drm fixes (mostly nouveau) from Dave Airlie: "One doc buidling fixes for a file that moved, along with a bunch of nouveau fixes, one a build problem on ARM" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/doc: Refer to proper source file drm/nouveau/platform: fix compilation error drm/nouveau/gk20a: add LTC device drm/nouveau: warn if we fail to re-pin fb on resume drm/nouveau/nvif: fix dac load detect method definition drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0 drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform drm/nouveau/bar: behave better if ioremap failed drm/nouveau/kms: nouveau_fbcon_accel_fini can be static drm/nouveau: kill unused variable warning if !__OS_HAS_AGP drm/nouveau/nvif: fix a number of notify thinkos
endian.h
/*
* linux/fs/befs/endian.h
*
* Copyright (C) 2001 Will Dyson <will_dyson@pobox.com>
*
* Partially based on similar funtions in the sysv driver.
*/
#ifndef LINUX_BEFS_ENDIAN
#define LINUX_BEFS_ENDIAN
#include <asm/byteorder.h>
static inline u64
fs64_to_cpu(const struct super_block *sb, fs64 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le64_to_cpu((__force __le64)n);
else
return be64_to_cpu((__force __be64)n);
}
static inline fs64
cpu_to_fs64(const struct super_block *sb, u64 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs64)cpu_to_le64(n);
else
return (__force fs64)cpu_to_be64(n);
}
static inline u32
fs32_to_cpu(const struct super_block *sb, fs32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le32_to_cpu((__force __le32)n);
else
return be32_to_cpu((__force __be32)n);
}
static inline fs32
cpu_to_fs32(const struct super_block *sb, u32 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs32)cpu_to_le32(n);
else
return (__force fs32)cpu_to_be32(n);
}
static inline u16
fs16_to_cpu(const struct super_block *sb, fs16 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return le16_to_cpu((__force __le16)n);
else
return be16_to_cpu((__force __be16)n);
}
static inline fs16
cpu_to_fs16(const struct super_block *sb, u16 n)
{
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
return (__force fs16)cpu_to_le16(n);
else
return (__force fs16)cpu_to_be16(n);
}
/* Composite types below here */
static inline befs_block_run
fsrun_to_cpu(const struct super_block *sb, befs_disk_block_run n)
{
befs_block_run run;
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) {
run.allocation_group = le32_to_cpu((__force __le32)n.allocation_group);
run.start = le16_to_cpu((__force __le16)n.start);
run.len = le16_to_cpu((__force __le16)n.len);
} else {
run.allocation_group = be32_to_cpu((__force __be32)n.allocation_group);
run.start = be16_to_cpu((__force __be16)n.start);
run.len = be16_to_cpu((__force __be16)n.len);
}
return run;
}
static inline befs_disk_block_run
cpu_to_fsrun(const struct super_block *sb, befs_block_run n)
{
befs_disk_block_run run;
if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) {
run.allocation_group = cpu_to_le32(n.allocation_group);
run.start = cpu_to_le16(n.start);
run.len = cpu_to_le16(n.len);
} else {
run.allocation_group = cpu_to_be32(n.allocation_group);
run.start = cpu_to_be16(n.start);
run.len = cpu_to_be16(n.len);
}
return run;
}
static inline befs_data_stream
fsds_to_cpu(const struct super_block *sb, const befs_disk_data_stream *n)
{
befs_data_stream data;
int i;
for (i = 0; i < BEFS_NUM_DIRECT_BLOCKS; ++i)
data.direct[i] = fsrun_to_cpu(sb, n->direct[i]);
data.max_direct_range = fs64_to_cpu(sb, n->max_direct_range);
data.indirect = fsrun_to_cpu(sb, n->indirect);
data.max_indirect_range = fs64_to_cpu(sb, n->max_indirect_range);
data.double_indirect = fsrun_to_cpu(sb, n->double_indirect);
data.max_double_indirect_range = fs64_to_cpu(sb,
n->
max_double_indirect_range);
data.size = fs64_to_cpu(sb, n->size);
return data;
}
#endif //LINUX_BEFS_ENDIAN
Computing file changes ...