Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel-common: Add ZBUD #18661

Merged
merged 1 commit into from
Sep 25, 2016
Merged

kernel-common: Add ZBUD #18661

merged 1 commit into from
Sep 25, 2016

Conversation

NeQuissimus
Copy link
Member

Motivation for this change

Fix #18533

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

I built a NixOS generation based on master with this change and the warnings mentioned in #18533 no longer appear.


Ping @abbradar

@mention-bot
Copy link

@NeQuissimus, thanks for your PR! By analyzing the annotation information on this pull request, we identified @edolstra, @wkennington and @zohl to be potential reviewers

@abbradar
Copy link
Member

Can you also make ZSMALLOC m? It appears that ZBUD was made the default back in 2013, so we can make ZSMALLOC a module to save space.

@abbradar abbradar added the 6.topic: kernel The Linux kernel label Sep 16, 2016
@dezgeg
Copy link
Contributor

dezgeg commented Sep 16, 2016

This sounds a bit like it's working around an upstream problem, either the kconfig dependencies should prevent an invalid configuration from being selected, or the code should cope with the default being a module.

@abbradar
Copy link
Member

Hm, I've approved this prematurely because we need to test one more thing -- can you try to build linux_3_10 to see if it's okay? Maybe we need to make ZBUD = ?y or something.

@NeQuissimus
Copy link
Member Author

Will kick off a kernel build in a minute...

@NeQuissimus
Copy link
Member Author

NeQuissimus commented Sep 16, 2016

I built 3.10, 3.12, 3.18 and 4.7. They all seem to build correctly now.

ZSMALLOC does not like being a module before 3.18

@NeQuissimus
Copy link
Member Author

I think the Travis failures are timeouts, not actual errors

@rasendubi
Copy link
Member

@abbradar can this be merged?

@abbradar abbradar merged commit ea4d517 into NixOS:master Sep 25, 2016
@NeQuissimus NeQuissimus deleted the kernel/zbud branch September 25, 2016 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: kernel The Linux kernel
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants